Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify menu items counting code in the unit test

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2019-09-29 23:42:56 +02:00
parent 758bd6fa6e
commit bd5b3725b9
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/menu/menu.cpp
View File

@@ -145,36 +145,37 @@ void MenuTestCase::CreateFrame()
wxMenu *subMenu = new wxMenu; wxMenu *subMenu = new wxMenu;
wxMenu *subsubMenu = 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 // 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 // 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"); subMenu->AppendSubMenu(subsubMenu, "Subsubmen&u", "Test a subsubmenu");
m_itemCount++;
// Check GetTitle() returns the correct string _before_ appending to the bar // Check GetTitle() returns the correct string _before_ appending to the bar
fileMenu->SetTitle("&Foo\tCtrl-F"); fileMenu->SetTitle("&Foo\tCtrl-F");
CPPUNIT_ASSERT_EQUAL( "&Foo\tCtrl-F", fileMenu->GetTitle() ); 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"); 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"); helpMenu->Append(MenuTestCase_Bar, "Bar\tF1");
m_itemCount++;
m_menuWithBar = helpMenu; m_menuWithBar = helpMenu;
helpMenu->AppendSubMenu(subMenu, "Sub&menu", "Test a submenu"); helpMenu->AppendSubMenu(subMenu, "Sub&menu", "Test a submenu");
m_itemCount++;
// +2 for "Foo" and "Bar", +2 for the 2 submenus
m_itemCount = itemcount + 4;
// Use an arraystring here, to help with future tests // Use an arraystring here, to help with future tests
m_menuLabels.Add("&File"); m_menuLabels.Add("&File");