From ac95f6da38a42079f69f4f96b2df7130d44e848a Mon Sep 17 00:00:00 2001 From: Thomas Nind Date: Mon, 5 Jul 2021 19:43:57 +0100 Subject: [PATCH 1/7] Added test constructing ncurses --- UnitTests/ConsoleDriverTests.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/UnitTests/ConsoleDriverTests.cs b/UnitTests/ConsoleDriverTests.cs index b988fe4d7e..d746a3194d 100644 --- a/UnitTests/ConsoleDriverTests.cs +++ b/UnitTests/ConsoleDriverTests.cs @@ -227,5 +227,16 @@ void SendKeys () Assert.Equal (key, lastKey); } + + [Fact] + public void Test_Construct_NCurses () + { + var type = typeof (View).Assembly.GetType ("Terminal.Gui.CursesDriver"); + var driver = Activator.CreateInstance (type, true); + + var d = ((ConsoleDriver)driver); + d.Init (() => { }); + d.End (); + } } } From 2d30b8a34ca39efe8cb79fbb7be68d80eddf0372 Mon Sep 17 00:00:00 2001 From: Thomas Nind Date: Mon, 5 Jul 2021 19:45:52 +0100 Subject: [PATCH 2/7] Added term env var output --- UnitTests/ConsoleDriverTests.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UnitTests/ConsoleDriverTests.cs b/UnitTests/ConsoleDriverTests.cs index d746a3194d..5a0e987e07 100644 --- a/UnitTests/ConsoleDriverTests.cs +++ b/UnitTests/ConsoleDriverTests.cs @@ -231,6 +231,9 @@ void SendKeys () [Fact] public void Test_Construct_NCurses () { + var t = Environment.GetEnvironmentVariable ("TERM"); + Console.WriteLine ("Term is:" + t); + var type = typeof (View).Assembly.GetType ("Terminal.Gui.CursesDriver"); var driver = Activator.CreateInstance (type, true); From b62b8b737182fdf5a41bf8a0ea404842027ae1c3 Mon Sep 17 00:00:00 2001 From: Thomas Nind Date: Mon, 5 Jul 2021 19:47:31 +0100 Subject: [PATCH 3/7] Added null operator --- UnitTests/ConsoleDriverTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitTests/ConsoleDriverTests.cs b/UnitTests/ConsoleDriverTests.cs index 5a0e987e07..22482c6991 100644 --- a/UnitTests/ConsoleDriverTests.cs +++ b/UnitTests/ConsoleDriverTests.cs @@ -231,7 +231,7 @@ void SendKeys () [Fact] public void Test_Construct_NCurses () { - var t = Environment.GetEnvironmentVariable ("TERM"); + var t = Environment.GetEnvironmentVariable ("TERM") ?? "Not Defined"; Console.WriteLine ("Term is:" + t); var type = typeof (View).Assembly.GetType ("Terminal.Gui.CursesDriver"); From 40a69dd2443551ca9d97bca7125ad366fd4893a0 Mon Sep 17 00:00:00 2001 From: Thomas Nind Date: Mon, 5 Jul 2021 19:51:23 +0100 Subject: [PATCH 4/7] Removed console writeline --- UnitTests/ConsoleDriverTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/UnitTests/ConsoleDriverTests.cs b/UnitTests/ConsoleDriverTests.cs index 22482c6991..3b78805d01 100644 --- a/UnitTests/ConsoleDriverTests.cs +++ b/UnitTests/ConsoleDriverTests.cs @@ -231,8 +231,7 @@ void SendKeys () [Fact] public void Test_Construct_NCurses () { - var t = Environment.GetEnvironmentVariable ("TERM") ?? "Not Defined"; - Console.WriteLine ("Term is:" + t); + var type = typeof (View).Assembly.GetType ("Terminal.Gui.CursesDriver"); var driver = Activator.CreateInstance (type, true); From c247cdc091c4b9f2e1010e04093ddcccae88c7af Mon Sep 17 00:00:00 2001 From: tznind Date: Mon, 5 Jul 2021 21:55:18 +0100 Subject: [PATCH 5/7] Added set TERM env var --- UnitTests/ConsoleDriverTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/UnitTests/ConsoleDriverTests.cs b/UnitTests/ConsoleDriverTests.cs index 3b78805d01..2d8b38a5e8 100644 --- a/UnitTests/ConsoleDriverTests.cs +++ b/UnitTests/ConsoleDriverTests.cs @@ -231,7 +231,9 @@ void SendKeys () [Fact] public void Test_Construct_NCurses () { - + if(string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TERM"))){ + Environment.SetEnvironmentVariable("TERM","linux"); + } var type = typeof (View).Assembly.GetType ("Terminal.Gui.CursesDriver"); var driver = Activator.CreateInstance (type, true); From 5ac8a089737747e08692ccaec83f8a06f8f01cf8 Mon Sep 17 00:00:00 2001 From: tznind Date: Mon, 5 Jul 2021 22:10:12 +0100 Subject: [PATCH 6/7] Set term to xterm? --- UnitTests/ConsoleDriverTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UnitTests/ConsoleDriverTests.cs b/UnitTests/ConsoleDriverTests.cs index 2d8b38a5e8..b76ee0f823 100644 --- a/UnitTests/ConsoleDriverTests.cs +++ b/UnitTests/ConsoleDriverTests.cs @@ -231,9 +231,9 @@ void SendKeys () [Fact] public void Test_Construct_NCurses () { - if(string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TERM"))){ - Environment.SetEnvironmentVariable("TERM","linux"); - } +// if(string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TERM"))){ + Environment.SetEnvironmentVariable("TERM","xterm"); +// } var type = typeof (View).Assembly.GetType ("Terminal.Gui.CursesDriver"); var driver = Activator.CreateInstance (type, true); From 4ca623f9505ece02432b9c09555fb01d21be8415 Mon Sep 17 00:00:00 2001 From: tznind Date: Mon, 5 Jul 2021 22:18:26 +0100 Subject: [PATCH 7/7] Construct only, no init --- UnitTests/ConsoleDriverTests.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/UnitTests/ConsoleDriverTests.cs b/UnitTests/ConsoleDriverTests.cs index b76ee0f823..8489c0ea3e 100644 --- a/UnitTests/ConsoleDriverTests.cs +++ b/UnitTests/ConsoleDriverTests.cs @@ -231,16 +231,8 @@ void SendKeys () [Fact] public void Test_Construct_NCurses () { -// if(string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("TERM"))){ - Environment.SetEnvironmentVariable("TERM","xterm"); -// } - var type = typeof (View).Assembly.GetType ("Terminal.Gui.CursesDriver"); var driver = Activator.CreateInstance (type, true); - - var d = ((ConsoleDriver)driver); - d.Init (() => { }); - d.End (); } } }