LocalTests_Remoting -> UnitTests_Remoting

microsoft · Dec 17, 2020 · 0579b24 · 0579b24
1 parent 590b9ff
commit 0579b24
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 48 deletions.
diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
@@ -107,9 +107,6 @@
       <Project>{CA5CAD1A-082C-4476-9F33-94B339494076}</Project>
     </ProjectReference>
 
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\Remoting\dll\Microsoft.Terminal.Remoting.vcxproj">
-      <Project>{27b5aaeb-a548-44cf-9777-f8baa32af7ae}</Project>
-    </ProjectReference>
   </ItemGroup>
 
   <PropertyGroup>
@@ -135,7 +132,6 @@
   <ItemGroup>
     <TestDll Include="$(OpenConsoleCommonOutDir)\LocalTests_TerminalApp\TerminalApp.LocalTests.dll" />
     <TestDll Include="$(OpenConsoleCommonOutDir)\LocalTests_SettingsModel\SettingsModel.LocalTests.dll" />
-    <TestDll Include="$(OpenConsoleCommonOutDir)\LocalTests_Remoting\Remoting.LocalTests.dll" />
   </ItemGroup>
 
   <Target Name="AfterBuild" Inputs="@(TestDll)" Outputs="@(TestDll->'$(TargetDir)'\%(Filename)%(Extension)')">

diff --git a/src/cascadia/Remoting/Monarch.cpp b/src/cascadia/Remoting/Monarch.cpp
@@ -178,29 +178,4 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         return createNewWindow;
     }
 
-    void Monarch::ToggleWindowingBehavior()
-    {
-        switch (_windowingBehavior)
-        {
-        case WindowingBehavior::UseNew:
-            _windowingBehavior = WindowingBehavior::UseExisting;
-            break;
-        case WindowingBehavior::UseExisting:
-            _windowingBehavior = WindowingBehavior::UseNew;
-            break;
-        }
-
-        printf("windowingBehavior: ");
-        switch (_windowingBehavior)
-        {
-        case WindowingBehavior::UseNew:
-            printf("useNew");
-            break;
-        case WindowingBehavior::UseExisting:
-            printf("useExisting");
-            break;
-        }
-        printf("\n");
-    }
-
 }
diff --git a/src/cascadia/Remoting/Monarch.h b/src/cascadia/Remoting/Monarch.h
@@ -18,7 +18,7 @@ enum class WindowingBehavior : uint64_t
     UseExisting = 1,
 };
 
-namespace RemotingLocalTests
+namespace RemotingUnitTests
 {
     class RemotingTests;
 };
@@ -37,7 +37,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void SetSelfID(const uint64_t selfID);
 
         bool ProposeCommandline(array_view<const winrt::hstring> args, winrt::hstring cwd);
-        void ToggleWindowingBehavior();
 
     private:
         Monarch(const uint64_t testPID);
@@ -55,7 +54,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void _peasantWindowActivated(const winrt::Windows::Foundation::IInspectable& sender,
                                      const winrt::Windows::Foundation::IInspectable& args);
 
-        friend class RemotingLocalTests::RemotingTests;
+        friend class RemotingUnitTests::RemotingTests;
     };
 }
 

diff --git a/...calTests_Remoting/LocalTests_Remoting.def → ...nitTests_Remoting/LocalTests_Remoting.def b/...calTests_Remoting/LocalTests_Remoting.def → ...nitTests_Remoting/LocalTests_Remoting.def
diff --git a/...ests_Remoting/Remoting.LocalTests.vcxproj → ...ests_Remoting/Remoting.LocalTests.vcxproj b/...ests_Remoting/Remoting.LocalTests.vcxproj → ...ests_Remoting/Remoting.LocalTests.vcxproj
diff --git a/...dia/LocalTests_Remoting/RemotingTests.cpp → ...adia/UnitTests_Remoting/RemotingTests.cpp b/...dia/LocalTests_Remoting/RemotingTests.cpp → ...adia/UnitTests_Remoting/RemotingTests.cpp
@@ -18,23 +18,11 @@ using namespace winrt::Microsoft::Terminal;
     name.attach(&_local_##name##);                            \
     auto cleanup = wil::scope_exit([&]() { name.detach(); });
 
-namespace RemotingLocalTests
+namespace RemotingUnitTests
 {
-    // TODO:microsoft/terminal#3838:
-    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
-    // an updated TAEF that will let us install framework packages when the test
-    // package is deployed. Until then, these tests won't deploy in CI.
-
     class RemotingTests
     {
-        // Use a custom AppxManifest to ensure that we can activate winrt types
-        // from our test. This property will tell taef to manually use this as
-        // the AppxManifest for this test class.
-        // This does not yet work for anything XAML-y. See TabTests.cpp for more
-        // details on that.
         BEGIN_TEST_CLASS(RemotingTests)
-            // TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
-            // TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
         END_TEST_CLASS()
 
         TEST_METHOD(CreateMonarch);

diff --git a/src/cascadia/LocalTests_Remoting/pch.cpp → src/cascadia/UnitTests_Remoting/pch.cpp b/src/cascadia/LocalTests_Remoting/pch.cpp → src/cascadia/UnitTests_Remoting/pch.cpp
diff --git a/src/cascadia/LocalTests_Remoting/pch.h → src/cascadia/UnitTests_Remoting/pch.h b/src/cascadia/LocalTests_Remoting/pch.h → src/cascadia/UnitTests_Remoting/pch.h
diff --git a/tools/runut.cmd b/tools/runut.cmd
@@ -23,10 +23,8 @@ call %TAEF% ^
     %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Types.Unit.Tests.dll ^
     %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\til.unit.tests.dll ^
     %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\UnitTests_TerminalApp\Terminal.App.Unit.Tests.dll ^
-    %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\LocalTests_Remoting\Remoting.LocalTests.dll ^
+    %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\UnitTests_Remoting\Remoting.UnitTests.dll ^
     %_TestHostAppPath%\TerminalApp.LocalTests.dll ^
     %_TestHostAppPath%\SettingsModel.LocalTests.dll ^
     %*
 
-
-    rem %_TestHostAppPath%\Remoting.LocalTests.dll ^