Add check to only open flyout if a menubaritem has items

dev/MenuBar/MenuBar_InteractionTests/MenuBarTests.cs

@@ -375,6 +375,30 @@ public void TabTest()
             }
         }
 
+        [TestMethod]
+        public void EmptyMenuBarItemNoPopupTest()
+        {
+            if (PlatformConfiguration.IsDevice(DeviceType.Phone))
+            {
+                Log.Comment("Skipping tests on phone, because menubar is not supported.");
+                return;
+            }
+            using (var setup = new TestSetupHelper("MenuBar Tests"))
+            {
+                FindElement.ByName<Button>("NoChildrenFlyout").Click();
+                VerifyElement.NotFound("Popup",FindBy.Name);
+
+                FindElement.ByName<Button>("OneChildrenFlyout").Click();
+                VerifyElement.Found("Popup", FindBy.Name);
+
+                // Click twice to close flyout
+                FindElement.ByName<Button>("RemoveItemsFromOneChildrenItem").Click();
+                FindElement.ByName<Button>("RemoveItemsFromOneChildrenItem").Click();
+
+                FindElement.ByName<Button>("OneChildrenFlyout").Click();
+                VerifyElement.NotFound("Popup", FindBy.Name);
+            }
+        }
 
         private T GetElement<T>(ref T element, string elementName) where T : UIObject
         {

dev/MenuBar/MenuBar_TestUI/MenuBarPage.xaml

@@ -56,7 +56,10 @@
                     <MenuFlyoutItem Text="Font..."/>
                 </muxc:MenuBarItem>
 
-                <muxc:MenuBarItem Title="No children"/>
+                <muxc:MenuBarItem Title="No children" AutomationProperties.Name="NoChildrenFlyout"/>
+                <muxc:MenuBarItem Title="One children" AutomationProperties.Name="OneChildrenFlyout" x:Name="OneChildrenFlyoutMenuBarItem">
+                    <MenuFlyoutItem Text="Sometext"/>
+                </muxc:MenuBarItem>
             </muxc:MenuBar>
 
             <TextBlock Text="Custom sized menu bar" Margin="0,6,0,0"/>
@@ -80,6 +83,7 @@
             <Button x:Name="AddFlyoutItemButton" AutomationProperties.Name="AddFlyoutItemButton" Click="AddFlyoutItem_Click" Content="Add Flyout Item"/>
             <Button x:Name="RemoveFlyoutItemButton" AutomationProperties.Name="RemoveFlyoutItemButton" Click="RemoveFlyoutItem_Click" Content="Remove Flyout Item"/>
             <Button x:Name="AddItemsToEmptyMenuBar" AutomationProperties.Name="AddItemsToEmptyMenuBar" Click="AddMenuBarToEmptyMenuBarItem_Click" Content="Add a menu item to the empty menu bar"/>
+            <Button x:Name="RemoveItemsFromOneChildrenItem" AutomationProperties.Name="RemoveItemsFromOneChildrenItem" Click="RemoveItemsFromOneChildrenItem_Click" Content="Remove items from One Children item"/>
         </StackPanel>
         <StackPanel Grid.Row="3">
             <TextBlock Text="Test output" Style="{ThemeResource StandardGroupHeader}"/>

dev/MenuBar/MenuBar_TestUI/MenuBarPage.xaml.cs

@@ -108,5 +108,9 @@ private void AddMenuBarToEmptyMenuBarItem_Click(object sender, RoutedEventArgs e
             EmptyMenuBar.Items.Add(mainMenuBarHelp);
         }
 
+        private void RemoveItemsFromOneChildrenItem_Click(object sender, RoutedEventArgs e)
+        {
+            OneChildrenFlyoutMenuBarItem.Items.Clear();
+        }
     }
 }