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

Replace CPPUNIT_ASSERT() macros in numeric validator unit tests

Browse Source 
Simplify code and use CHECK() rather than REQUIRE(), which is what
CPPUNIT_ASSERT() is defined as, to continue running the tests even if
some of them fail.
This commit is contained in:
Vadim Zeitlin
2021-02-21 00:33:22 +01:00
parent da973c3caf
commit d2b2e0a4ed
1 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
tests/validators/valnum.cpp
View File

@@ -50,26 +50,26 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferInt", "[valnum]")
wxIntegerValidator<int> valInt(&value); wxIntegerValidator<int> valInt(&value);
valInt.SetWindow(m_text); valInt.SetWindow(m_text);
CPPUNIT_ASSERT( valInt.TransferToWindow() ); CHECK( valInt.TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "0", m_text->GetValue() ); CHECK( m_text->GetValue() == "0" );
value = 17; value = 17;
CPPUNIT_ASSERT( valInt.TransferToWindow() ); CHECK( valInt.TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "17", m_text->GetValue() ); CHECK( m_text->GetValue() == "17" );
m_text->ChangeValue("foobar"); m_text->ChangeValue("foobar");
CPPUNIT_ASSERT( !valInt.TransferFromWindow() ); CHECK( !valInt.TransferFromWindow() );
m_text->ChangeValue("-234"); m_text->ChangeValue("-234");
CPPUNIT_ASSERT( valInt.TransferFromWindow() ); CHECK( valInt.TransferFromWindow() );
CPPUNIT_ASSERT_EQUAL( -234, value ); CHECK( value == -234 );
m_text->ChangeValue("9223372036854775808"); // == LLONG_MAX + 1 m_text->ChangeValue("9223372036854775808"); // == LLONG_MAX + 1
CPPUNIT_ASSERT( !valInt.TransferFromWindow() ); CHECK( !valInt.TransferFromWindow() );
m_text->Clear(); m_text->Clear();
CPPUNIT_ASSERT( !valInt.TransferFromWindow() ); CHECK( !valInt.TransferFromWindow() );
} }
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferUnsigned", "[valnum]") TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferUnsigned", "[valnum]")
@@ -78,29 +78,29 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferUnsigned", "[valnum]")
wxIntegerValidator<unsigned> valUnsigned(&value); wxIntegerValidator<unsigned> valUnsigned(&value);
valUnsigned.SetWindow(m_text); valUnsigned.SetWindow(m_text);
CPPUNIT_ASSERT( valUnsigned.TransferToWindow() ); CHECK( valUnsigned.TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "0", m_text->GetValue() ); CHECK( m_text->GetValue() == "0" );
value = 17; value = 17;
CPPUNIT_ASSERT( valUnsigned.TransferToWindow() ); CHECK( valUnsigned.TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "17", m_text->GetValue() ); CHECK( m_text->GetValue() == "17" );
m_text->ChangeValue("foobar"); m_text->ChangeValue("foobar");
CPPUNIT_ASSERT( !valUnsigned.TransferFromWindow() ); CHECK( !valUnsigned.TransferFromWindow() );
m_text->ChangeValue("-234"); m_text->ChangeValue("-234");
CPPUNIT_ASSERT( !valUnsigned.TransferFromWindow() ); CHECK( !valUnsigned.TransferFromWindow() );
m_text->ChangeValue("234"); m_text->ChangeValue("234");
CPPUNIT_ASSERT( valUnsigned.TransferFromWindow() ); CHECK( valUnsigned.TransferFromWindow() );
CPPUNIT_ASSERT_EQUAL( 234, value ); CHECK( value == 234 );
m_text->ChangeValue("18446744073709551616"); // == ULLONG_MAX + 1 m_text->ChangeValue("18446744073709551616"); // == ULLONG_MAX + 1
CPPUNIT_ASSERT( !valUnsigned.TransferFromWindow() ); CHECK( !valUnsigned.TransferFromWindow() );
m_text->Clear(); m_text->Clear();
CPPUNIT_ASSERT( !valUnsigned.TransferFromWindow() ); CHECK( !valUnsigned.TransferFromWindow() );
} }
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferFloat", "[valnum]") TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferFloat", "[valnum]")
@@ -112,27 +112,27 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferFloat", "[valnum]")
wxFloatingPointValidator<float> valFloat(3, &value); wxFloatingPointValidator<float> valFloat(3, &value);
valFloat.SetWindow(m_text); valFloat.SetWindow(m_text);
CPPUNIT_ASSERT( valFloat.TransferToWindow() ); CHECK( valFloat.TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "0.000", m_text->GetValue() ); CHECK( m_text->GetValue() == "0.000" );
value = 1.234f; value = 1.234f;
CPPUNIT_ASSERT( valFloat.TransferToWindow() ); CHECK( valFloat.TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "1.234", m_text->GetValue() ); CHECK( m_text->GetValue() == "1.234" );
value = 1.2345678f; value = 1.2345678f;
CPPUNIT_ASSERT( valFloat.TransferToWindow() ); CHECK( valFloat.TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "1.235", m_text->GetValue() ); CHECK( m_text->GetValue() == "1.235" );
m_text->ChangeValue("foobar"); m_text->ChangeValue("foobar");
CPPUNIT_ASSERT( !valFloat.TransferFromWindow() ); CHECK( !valFloat.TransferFromWindow() );
m_text->ChangeValue("-234.567"); m_text->ChangeValue("-234.567");
CPPUNIT_ASSERT( valFloat.TransferFromWindow() ); CHECK( valFloat.TransferFromWindow() );
CPPUNIT_ASSERT_EQUAL( -234.567f, value ); CHECK( value == -234.567f );
m_text->Clear(); m_text->Clear();
CPPUNIT_ASSERT( !valFloat.TransferFromWindow() ); CHECK( !valFloat.TransferFromWindow() );
} }
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::ZeroAsBlank", "[valnum]") TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::ZeroAsBlank", "[valnum]")
@@ -143,12 +143,12 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::ZeroAsBlank", "[valnum]")
wxValidator * const val = m_text->GetValidator(); wxValidator * const val = m_text->GetValidator();
CPPUNIT_ASSERT( val->TransferToWindow() ); CHECK( val->TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "", m_text->GetValue() ); CHECK( m_text->GetValue() == "" );
value++; value++;
CPPUNIT_ASSERT( val->TransferFromWindow() ); CHECK( val->TransferFromWindow() );
CPPUNIT_ASSERT_EQUAL( 0, value ); CHECK( value == 0 );
} }
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::NoTrailingZeroes", "[valnum]") TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::NoTrailingZeroes", "[valnum]")
@@ -162,12 +162,12 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::NoTrailingZeroes", "[valnum]")
wxValidator * const val = m_text->GetValidator(); wxValidator * const val = m_text->GetValidator();
CPPUNIT_ASSERT( val->TransferToWindow() ); CHECK( val->TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "1.2", m_text->GetValue() ); CHECK( m_text->GetValue() == "1.2" );
value = 1.234; value = 1.234;
CPPUNIT_ASSERT( val->TransferToWindow() ); CHECK( val->TransferToWindow() );
CPPUNIT_ASSERT_EQUAL( "1.234", m_text->GetValue() ); CHECK( m_text->GetValue() == "1.234" );
} }
#if wxUSE_UIACTIONSIMULATOR #if wxUSE_UIACTIONSIMULATOR
@@ -202,12 +202,12 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::Interactive", "[valnum]")
m_text->SetFocus(); m_text->SetFocus();
sim.Char('-'); sim.Char('-');
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "", m_text->GetValue() ); CHECK( m_text->GetValue() == "" );
// Neither is entering '.' or any non-digit character. // Neither is entering '.' or any non-digit character.
sim.Text(".a+/"); sim.Text(".a+/");
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "", m_text->GetValue() ); CHECK( m_text->GetValue() == "" );
// Entering digits should work though and after leaving the control the // Entering digits should work though and after leaving the control the
// contents should be normalized. // contents should be normalized.
@@ -216,43 +216,43 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::Interactive", "[valnum]")
text2->SetFocus(); text2->SetFocus();
wxYield(); wxYield();
if ( loc.IsOk() ) if ( loc.IsOk() )
CPPUNIT_ASSERT_EQUAL( "1,234,567", m_text->GetValue() ); CHECK( m_text->GetValue() == "1,234,567" );
else else
CPPUNIT_ASSERT_EQUAL( "1234567", m_text->GetValue() ); CHECK( m_text->GetValue() == "1234567" );
// Entering both '-' and '.' in this control should work but only in the // Entering both '-' and '.' in this control should work but only in the
// correct order. // correct order.
sim.Char('-'); sim.Char('-');
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "-", text2->GetValue() ); CHECK( text2->GetValue() == "-" );
text2->SetInsertionPoint(0); text2->SetInsertionPoint(0);
sim.Char('.'); sim.Char('.');
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "-", text2->GetValue() ); CHECK( text2->GetValue() == "-" );
text2->SetInsertionPointEnd(); text2->SetInsertionPointEnd();
sim.Char('.'); sim.Char('.');
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "-.", text2->GetValue() ); CHECK( text2->GetValue() == "-." );
// Adding up to three digits after the point should work. // Adding up to three digits after the point should work.
sim.Text("987"); sim.Text("987");
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "-.987", text2->GetValue() ); CHECK( text2->GetValue() == "-.987" );
// But no more. // But no more.
sim.Text("654"); sim.Text("654");
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "-.987", text2->GetValue() ); CHECK( text2->GetValue() == "-.987" );
// We can remove one digit and another one though. // We can remove one digit and another one though.
sim.Char(WXK_BACK); sim.Char(WXK_BACK);
sim.Char(WXK_BACK); sim.Char(WXK_BACK);
sim.Char('6'); sim.Char('6');
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "-.96", text2->GetValue() ); CHECK( text2->GetValue() == "-.96" );
// Also test the range constraint. // Also test the range constraint.
@@ -260,11 +260,11 @@ TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::Interactive", "[valnum]")
sim.Char('9'); sim.Char('9');
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "9", text2->GetValue() ); CHECK( text2->GetValue() == "9" );
sim.Char('9'); sim.Char('9');
wxYield(); wxYield();
CPPUNIT_ASSERT_EQUAL( "9", text2->GetValue() ); CHECK( text2->GetValue() == "9" );
} }
#endif // wxUSE_UIACTIONSIMULATOR #endif // wxUSE_UIACTIONSIMULATOR