From bd5b3725b97f98efa34ee7143329f1adad348eef Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 29 Sep 2019 23:42:56 +0200 Subject: [PATCH] Simplify menu items counting code in the unit test Get rid of an extra variable and just update m_itemCount on the go. No real changes, but this'll make adding more test menu items simpler. --- tests/menu/menu.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp index eb52235b22..ce33963e3a 100644 --- a/tests/menu/menu.cpp +++ b/tests/menu/menu.cpp @@ -145,36 +145,37 @@ void MenuTestCase::CreateFrame() wxMenu *subMenu = new wxMenu; wxMenu *subsubMenu = new wxMenu; - size_t itemcount = 0; + m_itemCount = 0; - PopulateMenu(subsubMenu, "Subsubmenu item ", itemcount); + PopulateMenu(subsubMenu, "Subsubmenu item ", m_itemCount); // Store one of its IDs for later - m_subsubmenuItemId = MenuTestCase_First + itemcount - 2; + m_subsubmenuItemId = MenuTestCase_First + m_itemCount - 2; - PopulateMenu(subMenu, "Submenu item ", itemcount); + PopulateMenu(subMenu, "Submenu item ", m_itemCount); // Store one of its IDs for later - m_submenuItemId = MenuTestCase_First + itemcount - 2; + m_submenuItemId = MenuTestCase_First + m_itemCount - 2; subMenu->AppendSubMenu(subsubMenu, "Subsubmen&u", "Test a subsubmenu"); + m_itemCount++; // Check GetTitle() returns the correct string _before_ appending to the bar fileMenu->SetTitle("&Foo\tCtrl-F"); CPPUNIT_ASSERT_EQUAL( "&Foo\tCtrl-F", fileMenu->GetTitle() ); - PopulateMenu(fileMenu, "Filemenu item ", itemcount); + PopulateMenu(fileMenu, "Filemenu item ", m_itemCount); fileMenu->Append(MenuTestCase_Foo, "&Foo\tCtrl-F", "Test item to be found"); + m_itemCount++; - PopulateMenu(helpMenu, "Helpmenu item ", itemcount); + PopulateMenu(helpMenu, "Helpmenu item ", m_itemCount); helpMenu->Append(MenuTestCase_Bar, "Bar\tF1"); + m_itemCount++; m_menuWithBar = helpMenu; helpMenu->AppendSubMenu(subMenu, "Sub&menu", "Test a submenu"); - - // +2 for "Foo" and "Bar", +2 for the 2 submenus - m_itemCount = itemcount + 4; + m_itemCount++; // Use an arraystring here, to help with future tests m_menuLabels.Add("&File");