-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create a control unittesting project (#9677)
Does what it says on the can. This is a follow up to #9472. Now that we have a control .lib, we can add tests for it. Unfortunately, the `TermControl` itself is a horrible mess. So this new unittest lib is empty for now. I'm working on actual tests as a part of #6842, but this PR is here to keep the diffs smaller. Also, apparently `server.vcxproj` had the wrong GUID in it. * [x] I work here * [x] Adds tests
- Loading branch information
1 parent
6f754a6
commit 24b9a7a
Showing
12 changed files
with
255 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1470,6 +1470,7 @@ MSIL | |
msix | ||
msrc | ||
msvcrt | ||
msvcrtd | ||
MSVS | ||
msys | ||
msysgit | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<PropertyGroup> | ||
<ProjectGuid>{C323DAEE-B307-4C7B-ACE5-7293CBEFCB5B}</ProjectGuid> | ||
<Keyword>Win32Proj</Keyword> | ||
<RootNamespace>ControlUnitTests</RootNamespace> | ||
<ProjectName>UnitTests_Control</ProjectName> | ||
<TargetName>Control.UnitTests</TargetName> | ||
<ConfigurationType>DynamicLibrary</ConfigurationType> | ||
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion> | ||
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion> | ||
<OpenConsoleCppWinRTProject>true</OpenConsoleCppWinRTProject> | ||
</PropertyGroup> | ||
|
||
<Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" /> | ||
<Import Project="$(OpenConsoleDir)\src\cppwinrt.build.pre.props" /> | ||
|
||
<!-- ========================= Headers ======================== --> | ||
<ItemGroup> | ||
<ClInclude Include="pch.h" /> | ||
</ItemGroup> | ||
|
||
<!-- ========================= Cpp Files ======================== --> | ||
<ItemGroup> | ||
<ClCompile Include="ControlCoreTests.cpp" /> | ||
<ClCompile Include="pch.cpp"> | ||
<PrecompiledHeader>Create</PrecompiledHeader> | ||
</ClCompile> | ||
</ItemGroup> | ||
|
||
<!-- ========================= Project References ======================== --> | ||
<ItemGroup> | ||
|
||
<ProjectReference Include="$(OpenConsoleDir)src\buffer\out\lib\bufferout.vcxproj" /> | ||
<ProjectReference Include="$(OpenConsoleDir)src\renderer\base\lib\base.vcxproj" /> | ||
<ProjectReference Include="$(OpenConsoleDir)src\renderer\dx\lib\dx.vcxproj" /> | ||
<ProjectReference Include="$(OpenConsoleDir)src\renderer\uia\lib\uia.vcxproj" /> | ||
<ProjectReference Include="$(OpenConsoleDir)src\terminal\parser\lib\parser.vcxproj" /> | ||
<ProjectReference Include="$(OpenConsoleDir)src\terminal\input\lib\terminalinput.vcxproj" /> | ||
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj" /> | ||
|
||
<ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalControl\TerminalControlLib.vcxproj" /> | ||
<ProjectReference Include="$(OpenConsoleDir)\src\types\lib\types.vcxproj" /> | ||
|
||
<!-- If you don't reference these projects here, the | ||
_ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's --> | ||
<ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalControl\dll\TerminalControl.vcxproj" /> | ||
</ItemGroup> | ||
|
||
<!-- ========================= Globals ======================== --> | ||
|
||
<!-- ====================== Compiler & Linker Flags ===================== --> | ||
<ItemDefinitionGroup> | ||
<ClCompile> | ||
<AdditionalIncludeDirectories>$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\cascadia\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalControl\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> | ||
|
||
<!-- Manually disable unreachable code warning, because jconcpp has a ton of that. --> | ||
<DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||
</ClCompile> | ||
<Link> | ||
<AdditionalDependencies>onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
<!-- | ||
ControlLib contains a DllMain that we need to force the use of. | ||
If you don't have this, then you'll see an error like | ||
"(init.obj) : error LNK2005: DllMain already defined in MSVCRTD.lib(dll_dllmain_stub.obj)" | ||
--> | ||
<AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12</AdditionalOptions> | ||
<AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions> | ||
</Link> | ||
</ItemDefinitionGroup> | ||
|
||
<PropertyGroup> | ||
<GenerateManifest>true</GenerateManifest> | ||
<EmbedManifest>true</EmbedManifest> | ||
</PropertyGroup> | ||
|
||
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. --> | ||
<Import Project="$(OpenConsoleDir)src\common.build.post.props" /> | ||
<Import Project="$(OpenConsoleDir)src\common.build.tests.props" /> | ||
|
||
|
||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT license. | ||
|
||
#include "pch.h" | ||
#include "../TerminalControl/EventArgs.h" | ||
|
||
using namespace Microsoft::Console; | ||
using namespace WEX::Logging; | ||
using namespace WEX::TestExecution; | ||
using namespace WEX::Common; | ||
|
||
using namespace winrt; | ||
using namespace winrt::Microsoft::Terminal; | ||
|
||
namespace ControlUnitTests | ||
{ | ||
class ControlCoreTests | ||
{ | ||
BEGIN_TEST_CLASS(ControlCoreTests) | ||
END_TEST_CLASS() | ||
|
||
TEST_METHOD(PlaceholderTest); | ||
}; | ||
|
||
void ControlCoreTests::PlaceholderTest() | ||
{ | ||
Log::Comment(L"This test is a placeholder while the rest of this test library is being authored."); | ||
VERIFY_IS_TRUE(true); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
EXPORTS | ||
DllCanUnloadNow = WINRT_CanUnloadNow PRIVATE | ||
DllGetActivationFactory = WINRT_GetActivationFactory PRIVATE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT license. | ||
|
||
#include "pch.h" |
Oops, something went wrong.