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

Extend XYToPostion unit test for multiline controls

Browse Source 
Extend the ranges of tested X,Y coordinates
to cover also areas beyond the text.
This commit is contained in:
Artur Wieczorek
2017-08-31 21:24:38 +02:00
parent 4503c41bd8
commit 4308386eff
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/controls/textctrltest.cpp
View File

@@ -828,12 +828,13 @@ void TextCtrlTestCase::XYToPositionMultiLine()
wxString text; wxString text;
// empty field // empty field
m_text->Clear(); m_text->Clear();
const long maxLineLength_0 = 0; const long maxLineLength_0 = 0+1;
const long numLines_0 = 1; const long numLines_0 = 1;
CPPUNIT_ASSERT_EQUAL( m_text->GetNumberOfLines(), numLines_0 ); CPPUNIT_ASSERT_EQUAL( m_text->GetNumberOfLines(), numLines_0 );
long pos_0[numLines_0+1][maxLineLength_0+1] = long pos_0[numLines_0+1][maxLineLength_0+1] =
{ { 0 } }; { { 0, -1 },
for ( long y = 0; y < numLines_0; y++ ) { -1, -1 } };
for ( long y = 0; y < numLines_0+1; y++ )
for( long x = 0; x < maxLineLength_0+1; x++ ) for( long x = 0; x < maxLineLength_0+1; x++ )
{ {
long p = m_text->XYToPosition(x, y); long p = m_text->XYToPosition(x, y);
@@ -843,13 +844,13 @@ void TextCtrlTestCase::XYToPositionMultiLine()
// one line // one line
text = wxS("1234"); text = wxS("1234");
m_text->SetValue(text); m_text->SetValue(text);
const long maxLineLength_1 = 4; const long maxLineLength_1 = 4+1;
const long numLines_1 = 1; const long numLines_1 = 1;
CPPUNIT_ASSERT_EQUAL( m_text->GetNumberOfLines(), numLines_1 ); CPPUNIT_ASSERT_EQUAL( m_text->GetNumberOfLines(), numLines_1 );
long pos_1[numLines_1+1][maxLineLength_1+1] = long pos_1[numLines_1+1][maxLineLength_1+1] =
{ { 0, 1, 2, 3, 4 }, { { 0, 1, 2, 3, 4, -1 },
{ -1, -1, -1, -1, -1 } }; { -1, -1, -1, -1, -1, -1 } };
for ( long y = 0; y < numLines_1; y++ ) for ( long y = 0; y < numLines_1+1; y++ )
for( long x = 0; x < maxLineLength_1+1; x++ ) for( long x = 0; x < maxLineLength_1+1; x++ )
{ {
long p = m_text->XYToPosition(x, y); long p = m_text->XYToPosition(x, y);
@@ -865,17 +866,19 @@ void TextCtrlTestCase::XYToPositionMultiLine()
#if defined(__WXMSW__) #if defined(__WXMSW__)
// Note: New lines are occupied by two characters. // Note: New lines are occupied by two characters.
long pos_2[numLines_2 + 1][maxLineLength_2 + 1] = long pos_2[numLines_2 + 1][maxLineLength_2 + 1] =
{ { 0, 1, 2, 3, -1 }, // New line occupies positions 3, 4 { { 0, 1, 2, 3, -1 }, // New line occupies positions 3, 4
{ 5, 6, 7, -1, -1 }, // New line occupies positions 7, 8 { 5, 6, 7, -1, -1 }, // New line occupies positions 7, 8
{ 9, 10, -1, -1, -1 } }; { 9, 10, -1, -1, -1 },
{ -1, -1, -1, -1, -1 } };
#else #else
long pos_2[numLines_2+1][maxLineLength_2+1] = long pos_2[numLines_2+1][maxLineLength_2+1] =
{ { 0, 1, 2, 3, -1 }, { { 0, 1, 2, 3, -1 },
{ 4, 5, 6, -1, -1 }, { 4, 5, 6, -1, -1 },
{ 7, -1, -1, -1, -1 } }; { 7, 8, -1, -1, -1 },
{ -1, -1, -1, -1, -1 } };
#endif // WXMSW/!WXMSW #endif // WXMSW/!WXMSW
for ( long y = 0; y < numLines_2; y++ ) for ( long y = 0; y < numLines_2+1; y++ )
for( long x = 0; x < maxLineLength_2+1; x++ ) for( long x = 0; x < maxLineLength_2+1; x++ )
{ {
long p = m_text->XYToPosition(x, y); long p = m_text->XYToPosition(x, y);
@@ -901,11 +904,11 @@ void TextCtrlTestCase::XYToPositionMultiLine()
{ { 0, -1 }, { { 0, -1 },
{ 1, -1 }, { 1, -1 },
{ 2, -1 }, { 2, -1 },
{ -1, -1 }, { 3, -1 },
{ -1, -1 } }; { -1, -1 } };
#endif // WXMSW/!WXMSW #endif // WXMSW/!WXMSW
for ( long y = 0; y < numLines_3; y++ ) for ( long y = 0; y < numLines_3+1; y++ )
for( long x = 0; x < maxLineLength_3+1; x++ ) for( long x = 0; x < maxLineLength_3+1; x++ )
{ {
long p = m_text->XYToPosition(x, y); long p = m_text->XYToPosition(x, y);
@@ -935,11 +938,11 @@ void TextCtrlTestCase::XYToPositionMultiLine()
{ 6, -1, -1, -1, -1 }, { 6, -1, -1, -1, -1 },
{ 7, 8, -1, -1, -1 }, { 7, 8, -1, -1, -1 },
{ 9, -1, -1, -1, -1 }, { 9, -1, -1, -1, -1 },
{ -1, -1, -1, -1, -1 }, { 10, -1, -1, -1, -1 },
{ -1, -1, -1, -1, -1 } }; { -1, -1, -1, -1, -1 } };
#endif // WXMSW/!WXMSW #endif // WXMSW/!WXMSW
for ( long y = 0; y < numLines_4; y++ ) for ( long y = 0; y < numLines_4+1; y++ )
for( long x = 0; x < maxLineLength_4+1; x++ ) for( long x = 0; x < maxLineLength_4+1; x++ )
{ {
long p = m_text->XYToPosition(x, y); long p = m_text->XYToPosition(x, y);