From d24d647c0d1694fe9b080340f07a3878a9f92743 Mon Sep 17 00:00:00 2001
From: Michael Ratanapintha <1039862+metathinker@users.noreply.github.com>
Date: Wed, 29 May 2019 19:51:17 -0700
Subject: [PATCH] Turn on Text Buffer unit tests in Azure DevOps CI build
 (#1057)

* rename TextBuffer.UnitTests.dll -> TextBuffer.Unit.Tests.dll

* renamed the project file as well
---
 OpenConsole.sln                                              | 2 +-
 ...uffer.Unittests.vcxproj => TextBuffer.Unit.Tests.vcxproj} | 4 ++--
 tools/runft.cmd                                              | 1 +
 tools/runuia.cmd                                             | 1 +
 tools/runut.cmd                                              | 3 ++-
 tools/tests.xml                                              | 5 +++--
 6 files changed, 10 insertions(+), 6 deletions(-)
 rename src/buffer/out/ut_textbuffer/{TextBuffer.Unittests.vcxproj => TextBuffer.Unit.Tests.vcxproj} (90%)

diff --git a/OpenConsole.sln b/OpenConsole.sln
index c4241b6e9..892383ddf 100644
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -71,7 +71,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Unit", "src\host
 		{06EC74CB-9A12-429C-B551-8562EC954747} = {06EC74CB-9A12-429C-B551-8562EC954747}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextBuffer.UnitTests", "src\buffer\out\ut_textbuffer\TextBuffer.UnitTests.vcxproj", "{531C23E7-4B76-4C08-8BBD-04164CB628C9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextBuffer.Unit.Tests", "src\buffer\out\ut_textbuffer\TextBuffer.Unit.Tests.vcxproj", "{531C23E7-4B76-4C08-8BBD-04164CB628C9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0CF235BD-2DA0-407E-90EE-C467E8BBC714} = {0CF235BD-2DA0-407E-90EE-C467E8BBC714}
 	EndProjectSection
diff --git a/src/buffer/out/ut_textbuffer/TextBuffer.Unittests.vcxproj b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj
similarity index 90%
rename from src/buffer/out/ut_textbuffer/TextBuffer.Unittests.vcxproj
rename to src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj
index e763c0f91..2998c3460 100644
--- a/src/buffer/out/ut_textbuffer/TextBuffer.Unittests.vcxproj
+++ b/src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj
@@ -21,8 +21,8 @@
     <ProjectGuid>{531C23E7-4B76-4C08-8BBD-04164CB628C9}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>TextBufferUnitTests</RootNamespace>
-    <ProjectName>TextBuffer.UnitTests</ProjectName>
-    <TargetName>TextBuffer.UnitTests</TargetName>
+    <ProjectName>TextBuffer.Unit.Tests</ProjectName>
+    <TargetName>TextBuffer.Unit.Tests</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/tools/runft.cmd b/tools/runft.cmd
index bddc6230e..f2632c886 100644
--- a/tools/runft.cmd
+++ b/tools/runft.cmd
@@ -1,6 +1,7 @@
 @echo off
 
 rem Run the console feature tests.
+rem Keep this file in sync with tests.xml
 
 call %TAEF% ^
     %OPENCON%\bin\%ARCH%\Debug\ConHost.Feature.Tests.dll ^
diff --git a/tools/runuia.cmd b/tools/runuia.cmd
index 8b6501769..2ab2625a6 100644
--- a/tools/runuia.cmd
+++ b/tools/runuia.cmd
@@ -1,6 +1,7 @@
 @echo off
 
 rem Run the console UI Automation tests.
+rem Keep this file in sync with tests.xml
 
 rem Get AppDriver going first... You'll have to close it yourself.
 
diff --git a/tools/runut.cmd b/tools/runut.cmd
index 51dffb5e0..1f9ade743 100644
--- a/tools/runut.cmd
+++ b/tools/runut.cmd
@@ -1,10 +1,11 @@
 @echo off
 
 rem Run the console unit tests.
+rem Keep this file in sync with tests.xml
 
 call %TAEF% ^
     %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Conhost.Unit.Tests.dll ^
-    %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\TextBuffer.Unittests.dll ^
+    %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\TextBuffer.Unit.Tests.dll ^
     %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Terminal.Core.Unit.Tests.dll ^
     %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Conhost.Interactivity.Win32.Unit.Tests.dll ^
     %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\ConParser.Unit.Tests.dll ^
diff --git a/tools/tests.xml b/tools/tests.xml
index 3a64144b8..05a8b4d83 100644
--- a/tools/tests.xml
+++ b/tools/tests.xml
@@ -1,7 +1,8 @@
-
+<!-- Used by Invoke-OpenConsoleTests in OpenConsole.psm1. Keep in sync with runABC.cmd files -->
 <tests>
   <test name="host" type="unit" binary="Conhost.Unit.Tests.dll" />
-  <test name="textbuffer" type="unit" binary="TextBuffer.Unittests.dll" />
+  <test name="textBuffer" type="unit" binary="TextBuffer.Unit.Tests.dll" />
+  <test name="terminalCore" type="unit" binary="Terminal.Core.Unit.Tests.dll" />
   <test name="interactivityWin32" type="unit" binary="Conhost.Interactivity.Win32.Unit.Tests.dll" />
   <test name="terminal" type="unit" binary="ConParser.Unit.Tests.dll" />
   <test name="adapter" type="unit" binary="ConAdapter.Unit.Tests.dll" />