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

Fix SelectEmptyGrid wxGrid unit test

Browse Source 
Use CATCH nested sections correctly.
This commit is contained in:
Ilya Sinitsyn
2020-03-03 00:18:33 +07:00
committed by Vadim Zeitlin
parent acd72efbf1
commit d1c8bba2b6
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/controls/gridtest.cpp
View File

@@ -526,22 +526,22 @@ TEST_CASE_METHOD(GridTestCase, "Grid::Selection", "[grid]")
TEST_CASE_METHOD(GridTestCase, "Grid::SelectEmptyGrid", "[grid]") TEST_CASE_METHOD(GridTestCase, "Grid::SelectEmptyGrid", "[grid]")
{ {
SECTION("Delete rows/columns") for ( int i = 0; i < 2; ++i )
{ {
SECTION("No rows") SECTION(i == 0 ? "No rows" : "No columns")
{
if ( i == 0 )
{ {
m_grid->DeleteRows(0, 10); m_grid->DeleteRows(0, 10);
REQUIRE( m_grid->GetNumberRows() == 0 ); REQUIRE( m_grid->GetNumberRows() == 0 );
} }
SECTION("No columns") else
{ {
m_grid->DeleteCols(0, 2); m_grid->DeleteCols(0, 2);
REQUIRE( m_grid->GetNumberCols() == 0 ); REQUIRE( m_grid->GetNumberCols() == 0 );
} }
}
SECTION("Select")
{
SECTION("Move right") SECTION("Move right")
{ {
m_grid->MoveCursorRight(true); m_grid->MoveCursorRight(true);
@@ -559,9 +559,13 @@ TEST_CASE_METHOD(GridTestCase, "Grid::SelectEmptyGrid", "[grid]")
m_grid->SelectCol(1); m_grid->SelectCol(1);
} }
} }
}
CHECK( m_grid->GetSelectedCells().Count() == 0 );
CHECK( m_grid->GetSelectionBlockTopLeft().Count() == 0 ); CHECK( m_grid->GetSelectionBlockTopLeft().Count() == 0 );
CHECK( m_grid->GetSelectionBlockBottomRight().Count() == 0 ); CHECK( m_grid->GetSelectionBlockBottomRight().Count() == 0 );
CHECK( m_grid->GetSelectedRows().Count() == 0 );
CHECK( m_grid->GetSelectedCols().Count() == 0 );
} }
TEST_CASE_METHOD(GridTestCase, "Grid::ScrollWhenSelect", "[grid]") TEST_CASE_METHOD(GridTestCase, "Grid::ScrollWhenSelect", "[grid]")