Fix DefaultMenuBarItems_IsExactlyAsExpected

Author: tznind

Showcase/Showcase.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4881 " />
+    <PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4946 " />
   </ItemGroup>
 
 </Project>

src/TerminalGuiDesigner.csproj

@@ -20,7 +20,7 @@
 		<PackageOutputPath>./nupkg</PackageOutputPath>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>TerminalGuiDesigner</PackageId>
-		<Version>2.0.0-develop.4881 </Version>
+		<Version>2.0.0-develop.4946 </Version>
 		<Authors>Thomas Nind</Authors>
 		<Nullable>enable</Nullable>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -33,7 +33,7 @@
 		<PackageIcon>logo.png</PackageIcon>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageReleaseNotes>
-			2.0.0-alpha.4881 
+			2.0.0-alpha.4946 
 			* Update to latest nuget package
 			* Fix crash caused moving PosRelative view without its pair into different container View
 			2.0.0-alpha.4519
@@ -165,7 +165,7 @@
 		<PackageReference Include="Serilog" Version="4.2.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-		<PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4881 " />
+		<PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4946 " />
 		<PackageReference Include="nlog" Version="5.3.3" />
 		<PackageReference Include="Basic.Reference.Assemblies.Net100" Version="1.7.7" />
 		<PackageReference Include="System.CodeDom" Version="10.0.0" />

src/ViewFactory.cs

@@ -79,7 +79,7 @@ internal static MenuBarItem[] DefaultMenuBarItems
         {
             return
             [
-                new( "_File (F9)",
+                new MenuBarItem( "_File (F9)",
                      [ new MenuItem( DefaultMenuItemText, string.Empty, static ( ) => { } ) ] )
             ];
         }

tests/ViewFactoryTests.cs

@@ -2,6 +2,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Terminal.Gui.ViewBase;
+using Terminal.Gui.Views;
 
 namespace UnitTests;
 
@@ -107,17 +108,15 @@ public void CreateT_ThrowsOnUnsupportedTypes( [ValueSource( nameof( CreateT_Thro
     [Category( "Change Control" )]
     public void DefaultMenuBarItems_IsExactlyAsExpected( )
     {
-        Assert.Multiple( static ( ) =>
-        {
-            Assert.That( ViewFactory_DefaultMenuBarItems, Has.Length.EqualTo( 1 ) );
-            Assert.That( ViewFactory_DefaultMenuBarItems[ 0 ].Title, Is.EqualTo( "_File (F9)" ) );
-        } );
 
-        Assert.Multiple( static ( ) =>
-        {
-            Assert.That( ViewFactory_DefaultMenuBarItems[ 0 ].SubViews, Has.Length.EqualTo( 1 ) );
-            Assert.That( ViewFactory_DefaultMenuBarItems[ 0 ].SubViews.ElementAt( 0 ).Title, Is.EqualTo( ViewFactory.DefaultMenuItemText ) );
-        } );
+        // Confirm creates a single menu 
+        Assert.That( ViewFactory_DefaultMenuBarItems.Count, Is.EqualTo(1));
+        Assert.That( ViewFactory_DefaultMenuBarItems[ 0 ].SubViews.ElementAt(0).Text, Is.EqualTo( "_File (F9)" ) );
+
+        // With single item under it "Edit Me"
+        Assert.That( ViewFactory_DefaultMenuBarItems [ 0 ].PopoverMenu, Is.Not.Null);
+        Assert.That( ViewFactory_DefaultMenuBarItems[ 0 ].PopoverMenu!.Root!.SubViews.Count, Is.EqualTo( 1 ) );
+        Assert.That(ViewFactory_DefaultMenuBarItems[0].PopoverMenu!.Root!.SubViews.ElementAt(0).Title, Is.EqualTo("Edit Me"));
     }
 
     [Test]