From 5d77dd71762d8ea667a83d6096d2f877c933442d Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Sat, 12 Aug 2023 09:50:27 -0600 Subject: [PATCH] daignosing unit test fail in action --- .../ConsoleDrivers/CursesDriver/CursesDriver.cs | 2 +- Terminal.Gui/ConsoleDrivers/NetDriver.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs index 150661366..be83d6bcf 100644 --- a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs +++ b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs @@ -625,7 +625,7 @@ internal class CursesDriver : ConsoleDriver { } catch (Exception e) { _window = null; _runningUnitTests = true; - Debug.WriteLine ($"Curses failed to initialize. Assuming Unit Tests. The exception is: {e.Message}"); + throw new InvalidProgramException ($"Curses failed to initialize. Assuming Unit Tests. The exception is: {e.Message}"); } if (!_runningUnitTests) { diff --git a/Terminal.Gui/ConsoleDrivers/NetDriver.cs b/Terminal.Gui/ConsoleDrivers/NetDriver.cs index 6e4f06aa1..13aeaccaf 100644 --- a/Terminal.Gui/ConsoleDrivers/NetDriver.cs +++ b/Terminal.Gui/ConsoleDrivers/NetDriver.cs @@ -611,20 +611,22 @@ internal class NetDriver : ConsoleDriver { TerminalResized = terminalResized; try { + // In unit tests, this will throw + Console.TreatControlCAsInput = true; + + Cols = Console.WindowWidth; + Rows = Console.WindowHeight; + //Enable alternative screen buffer. Console.Out.Write (EscSeqUtils.CSI_SaveCursorAndActivateAltBufferNoBackscroll); //Set cursor key to application. Console.Out.Write (EscSeqUtils.CSI_HideCursor); - Console.TreatControlCAsInput = true; - Cols = Console.WindowWidth; - Rows = Console.WindowHeight; } catch (IOException) { // We are being run in an environment that does not support a console // such as a unit test, or a pipe. _runningUnitTests = true; - throw new InvalidProgramException (); Cols = 80; Rows = 24; }