Merge branch 'valnum-unsigned'
Fix handling of unsigned types in numeric validators: don't accept negative numbers as unsigned, allow using the full 64-bit range. See https://github.com/wxWidgets/wxWidgets/pull/2244 Closes #12967.
This commit is contained in:
Vadim Zeitlin
@@ -20,220 +20,145 @@
|
||||
// test class
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class NumFormatterTestCase : public CppUnit::TestCase
|
||||
namespace
|
||||
{
|
||||
|
||||
class NumFormatterTestCase
|
||||
{
|
||||
public:
|
||||
NumFormatterTestCase() { m_locale = NULL; }
|
||||
|
||||
virtual void setUp() wxOVERRIDE
|
||||
{
|
||||
NumFormatterTestCase() :
|
||||
// We need to use a locale with known decimal point and which uses the
|
||||
// thousands separator for the tests to make sense.
|
||||
m_locale = new wxLocale(wxLANGUAGE_ENGLISH_UK,
|
||||
wxLOCALE_DONT_LOAD_DEFAULT);
|
||||
if ( !m_locale->IsOk() )
|
||||
tearDown();
|
||||
m_locale(wxLANGUAGE_ENGLISH_UK, wxLOCALE_DONT_LOAD_DEFAULT)
|
||||
{
|
||||
}
|
||||
|
||||
virtual void tearDown() wxOVERRIDE
|
||||
{
|
||||
delete m_locale;
|
||||
m_locale = NULL;
|
||||
}
|
||||
protected:
|
||||
bool CanRunTest() const { return m_locale.IsOk(); }
|
||||
|
||||
private:
|
||||
CPPUNIT_TEST_SUITE( NumFormatterTestCase );
|
||||
CPPUNIT_TEST( LongToString );
|
||||
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
CPPUNIT_TEST( LongLongToString );
|
||||
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
CPPUNIT_TEST( DoubleToString );
|
||||
CPPUNIT_TEST( NoTrailingZeroes );
|
||||
CPPUNIT_TEST( LongFromString );
|
||||
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
CPPUNIT_TEST( LongLongFromString );
|
||||
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
CPPUNIT_TEST( DoubleFromString );
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
void LongToString();
|
||||
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
void LongLongToString();
|
||||
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
void DoubleToString();
|
||||
void NoTrailingZeroes();
|
||||
void LongFromString();
|
||||
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
void LongLongFromString();
|
||||
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
void DoubleFromString();
|
||||
|
||||
wxLocale *m_locale;
|
||||
wxLocale m_locale;
|
||||
|
||||
wxDECLARE_NO_COPY_CLASS(NumFormatterTestCase);
|
||||
};
|
||||
|
||||
// register in the unnamed registry so that these tests are run by default
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION( NumFormatterTestCase );
|
||||
// A couple of helpers to avoid writing over long expressions.
|
||||
wxString ToStringWithoutTrailingZeroes(double val, int precision)
|
||||
{
|
||||
return wxNumberFormatter::ToString
|
||||
(
|
||||
val,
|
||||
precision,
|
||||
wxNumberFormatter::Style_NoTrailingZeroes
|
||||
);
|
||||
}
|
||||
|
||||
// also include in its own registry so that these tests can be run alone
|
||||
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NumFormatterTestCase, "NumFormatterTestCase" );
|
||||
wxString ToStringWithTrailingZeroes(double val, int precision)
|
||||
{
|
||||
return wxNumberFormatter::ToString
|
||||
(
|
||||
val,
|
||||
precision,
|
||||
wxNumberFormatter::Style_None
|
||||
);
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// tests themselves
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
void NumFormatterTestCase::LongToString()
|
||||
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongToString", "[numformatter]")
|
||||
{
|
||||
if ( !m_locale )
|
||||
if ( !CanRunTest() )
|
||||
return;
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( "1", wxNumberFormatter::ToString( 1L));
|
||||
CPPUNIT_ASSERT_EQUAL( "-1", wxNumberFormatter::ToString( -1L));
|
||||
CPPUNIT_ASSERT_EQUAL( "12", wxNumberFormatter::ToString( 12L));
|
||||
CPPUNIT_ASSERT_EQUAL( "-12", wxNumberFormatter::ToString( -12L));
|
||||
CPPUNIT_ASSERT_EQUAL( "123", wxNumberFormatter::ToString( 123L));
|
||||
CPPUNIT_ASSERT_EQUAL( "-123", wxNumberFormatter::ToString( -123L));
|
||||
CPPUNIT_ASSERT_EQUAL( "1,234", wxNumberFormatter::ToString( 1234L));
|
||||
CPPUNIT_ASSERT_EQUAL( "-1,234", wxNumberFormatter::ToString( -1234L));
|
||||
CPPUNIT_ASSERT_EQUAL( "12,345", wxNumberFormatter::ToString( 12345L));
|
||||
CPPUNIT_ASSERT_EQUAL( "-12,345", wxNumberFormatter::ToString( -12345L));
|
||||
CPPUNIT_ASSERT_EQUAL( "123,456", wxNumberFormatter::ToString( 123456L));
|
||||
CPPUNIT_ASSERT_EQUAL( "-123,456", wxNumberFormatter::ToString( -123456L));
|
||||
CPPUNIT_ASSERT_EQUAL( "1,234,567", wxNumberFormatter::ToString( 1234567L));
|
||||
CPPUNIT_ASSERT_EQUAL( "-1,234,567", wxNumberFormatter::ToString( -1234567L));
|
||||
CPPUNIT_ASSERT_EQUAL( "12,345,678", wxNumberFormatter::ToString( 12345678L));
|
||||
CPPUNIT_ASSERT_EQUAL("-12,345,678", wxNumberFormatter::ToString( -12345678L));
|
||||
CPPUNIT_ASSERT_EQUAL("123,456,789", wxNumberFormatter::ToString( 123456789L));
|
||||
CHECK( wxNumberFormatter::ToString( 1L) == "1" );
|
||||
CHECK( wxNumberFormatter::ToString( -1L) == "-1" );
|
||||
CHECK( wxNumberFormatter::ToString( 12L) == "12" );
|
||||
CHECK( wxNumberFormatter::ToString( -12L) == "-12" );
|
||||
CHECK( wxNumberFormatter::ToString( 123L) == "123" );
|
||||
CHECK( wxNumberFormatter::ToString( -123L) == "-123" );
|
||||
CHECK( wxNumberFormatter::ToString( 1234L) == "1,234" );
|
||||
CHECK( wxNumberFormatter::ToString( -1234L) == "-1,234" );
|
||||
CHECK( wxNumberFormatter::ToString( 12345L) == "12,345" );
|
||||
CHECK( wxNumberFormatter::ToString( -12345L) == "-12,345" );
|
||||
CHECK( wxNumberFormatter::ToString( 123456L) == "123,456" );
|
||||
CHECK( wxNumberFormatter::ToString( -123456L) == "-123,456" );
|
||||
CHECK( wxNumberFormatter::ToString( 1234567L) == "1,234,567" );
|
||||
CHECK( wxNumberFormatter::ToString( -1234567L) == "-1,234,567" );
|
||||
CHECK( wxNumberFormatter::ToString( 12345678L) == "12,345,678" );
|
||||
CHECK( wxNumberFormatter::ToString( -12345678L) == "-12,345,678" );
|
||||
CHECK( wxNumberFormatter::ToString( 123456789L) == "123,456,789" );
|
||||
}
|
||||
|
||||
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
|
||||
void NumFormatterTestCase::LongLongToString()
|
||||
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongLongToString", "[numformatter]")
|
||||
{
|
||||
if ( !m_locale )
|
||||
if ( !CanRunTest() )
|
||||
return;
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( "1", wxNumberFormatter::ToString(wxLL( 1)));
|
||||
CPPUNIT_ASSERT_EQUAL( "12", wxNumberFormatter::ToString(wxLL( 12)));
|
||||
CPPUNIT_ASSERT_EQUAL( "123", wxNumberFormatter::ToString(wxLL( 123)));
|
||||
CPPUNIT_ASSERT_EQUAL( "1,234", wxNumberFormatter::ToString(wxLL( 1234)));
|
||||
CPPUNIT_ASSERT_EQUAL( "12,345", wxNumberFormatter::ToString(wxLL( 12345)));
|
||||
CPPUNIT_ASSERT_EQUAL( "123,456", wxNumberFormatter::ToString(wxLL( 123456)));
|
||||
CPPUNIT_ASSERT_EQUAL( "1,234,567", wxNumberFormatter::ToString(wxLL( 1234567)));
|
||||
CPPUNIT_ASSERT_EQUAL( "12,345,678", wxNumberFormatter::ToString(wxLL( 12345678)));
|
||||
CPPUNIT_ASSERT_EQUAL("123,456,789", wxNumberFormatter::ToString(wxLL( 123456789)));
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 1)) == "1" );
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 12)) == "12" );
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 123)) == "123" );
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 1234)) == "1,234" );
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 12345)) == "12,345" );
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 123456)) == "123,456" );
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 1234567)) == "1,234,567" );
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 12345678)) == "12,345,678" );
|
||||
CHECK( wxNumberFormatter::ToString(wxLL( 123456789)) == "123,456,789" );
|
||||
}
|
||||
|
||||
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
|
||||
void NumFormatterTestCase::DoubleToString()
|
||||
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::DoubleToString", "[numformatter]")
|
||||
{
|
||||
if ( !m_locale )
|
||||
if ( !CanRunTest() )
|
||||
return;
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL("1.0", wxNumberFormatter::ToString(1., 1));
|
||||
CPPUNIT_ASSERT_EQUAL("0.123456", wxNumberFormatter::ToString(0.123456, 6));
|
||||
CPPUNIT_ASSERT_EQUAL("1.234567", wxNumberFormatter::ToString(1.234567, 6));
|
||||
CPPUNIT_ASSERT_EQUAL("12.34567", wxNumberFormatter::ToString(12.34567, 5));
|
||||
CPPUNIT_ASSERT_EQUAL("123.4567", wxNumberFormatter::ToString(123.4567, 4));
|
||||
CPPUNIT_ASSERT_EQUAL("1,234.56", wxNumberFormatter::ToString(1234.56, 2));
|
||||
CPPUNIT_ASSERT_EQUAL("12,345.6", wxNumberFormatter::ToString(12345.6, 1));
|
||||
CPPUNIT_ASSERT_EQUAL("12,345.6", wxNumberFormatter::ToString(12345.6, 1));
|
||||
CPPUNIT_ASSERT_EQUAL("123,456,789.0",
|
||||
wxNumberFormatter::ToString(123456789., 1));
|
||||
CPPUNIT_ASSERT_EQUAL("123,456,789.012",
|
||||
wxNumberFormatter::ToString(123456789.012, 3));
|
||||
CPPUNIT_ASSERT_EQUAL("12,345",
|
||||
wxNumberFormatter::ToString(12345.012, -1));
|
||||
CPPUNIT_ASSERT_EQUAL("-123.1230",
|
||||
wxNumberFormatter::ToString(-123.123, 4, wxNumberFormatter::Style_None));
|
||||
CPPUNIT_ASSERT_EQUAL("0.0",
|
||||
wxNumberFormatter::ToString(0.02, 1, wxNumberFormatter::Style_None));
|
||||
CPPUNIT_ASSERT_EQUAL("-0.0",
|
||||
wxNumberFormatter::ToString(-0.02, 1, wxNumberFormatter::Style_None));
|
||||
CHECK( wxNumberFormatter::ToString( 1., 1) == "1.0" );
|
||||
CHECK( wxNumberFormatter::ToString( 0.123456, 6) == "0.123456" );
|
||||
CHECK( wxNumberFormatter::ToString( 1.234567, 6) == "1.234567" );
|
||||
CHECK( wxNumberFormatter::ToString( 12.34567, 5) == "12.34567" );
|
||||
CHECK( wxNumberFormatter::ToString( 123.4567, 4) == "123.4567" );
|
||||
CHECK( wxNumberFormatter::ToString( 1234.56, 2) == "1,234.56" );
|
||||
CHECK( wxNumberFormatter::ToString( 12345.6, 1) == "12,345.6" );
|
||||
CHECK( wxNumberFormatter::ToString(123456789.012, 3) == "123,456,789.012" );
|
||||
CHECK( wxNumberFormatter::ToString( 12345.012, -1) == "12,345" );
|
||||
|
||||
CHECK( ToStringWithTrailingZeroes(-123.123, 4) == "-123.1230" );
|
||||
CHECK( ToStringWithTrailingZeroes( 0.02, 1) == "0.0" );
|
||||
CHECK( ToStringWithTrailingZeroes( -0.02, 1) == "-0.0" );
|
||||
}
|
||||
|
||||
void NumFormatterTestCase::NoTrailingZeroes()
|
||||
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::NoTrailingZeroes", "[numformatter]")
|
||||
{
|
||||
WX_ASSERT_FAILS_WITH_ASSERT
|
||||
(
|
||||
wxNumberFormatter::ToString(123L, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
if ( !m_locale )
|
||||
if ( !CanRunTest() )
|
||||
return;
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123.000",
|
||||
wxNumberFormatter::ToString(123., 3)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123",
|
||||
wxNumberFormatter::ToString(123., 3, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123",
|
||||
wxNumberFormatter::ToString(123., 9, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123.456",
|
||||
wxNumberFormatter::ToString(123.456, 3, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123.456000000",
|
||||
wxNumberFormatter::ToString(123.456, 9)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123.456",
|
||||
wxNumberFormatter::ToString(123.456, 9, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123.12",
|
||||
wxNumberFormatter::ToString(123.123, 2, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123",
|
||||
wxNumberFormatter::ToString(123.123, 0, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"0",
|
||||
wxNumberFormatter::ToString(-0.000123, 3, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"123",
|
||||
wxNumberFormatter::ToString(123., -1, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL
|
||||
(
|
||||
"1e-120",
|
||||
wxNumberFormatter::ToString(1e-120, -1, wxNumberFormatter::Style_NoTrailingZeroes)
|
||||
);
|
||||
CHECK( ToStringWithTrailingZeroes ( 123., 3) == "123.000" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( 123., 3) == "123" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( 123., 9) == "123" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( 123.456, 3) == "123.456" );
|
||||
CHECK( ToStringWithTrailingZeroes ( 123.456, 9) == "123.456000000" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( 123.456, 9) == "123.456" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( 123.123, 2) == "123.12" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( 123.123, 0) == "123" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( -0.000123, 3) == "0" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( 123., -1) == "123" );
|
||||
CHECK( ToStringWithoutTrailingZeroes( 1e-120, -1) == "1e-120" );
|
||||
}
|
||||
|
||||
void NumFormatterTestCase::LongFromString()
|
||||
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongFromString", "[numformatter]")
|
||||
{
|
||||
if ( !m_locale )
|
||||
if ( !CanRunTest() )
|
||||
return;
|
||||
|
||||
WX_ASSERT_FAILS_WITH_ASSERT
|
||||
@@ -242,34 +167,43 @@ void NumFormatterTestCase::LongFromString()
|
||||
);
|
||||
|
||||
long l;
|
||||
CPPUNIT_ASSERT( !wxNumberFormatter::FromString("", &l) );
|
||||
CPPUNIT_ASSERT( !wxNumberFormatter::FromString("foo", &l) );
|
||||
CPPUNIT_ASSERT( !wxNumberFormatter::FromString("1.234", &l) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("", &l) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("foo", &l) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("1.234", &l) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("-", &l) );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123, l );
|
||||
CHECK( wxNumberFormatter::FromString("0", &l) );
|
||||
CHECK( l == 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("1234", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 1234, l );
|
||||
CHECK( wxNumberFormatter::FromString("123", &l) );
|
||||
CHECK( l == 123 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("1,234", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 1234, l );
|
||||
CHECK( wxNumberFormatter::FromString("1234", &l) );
|
||||
CHECK( l == 1234 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("12,345", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 12345, l );
|
||||
CHECK( wxNumberFormatter::FromString("1,234", &l) );
|
||||
CHECK( l == 1234 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123,456", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123456, l );
|
||||
CHECK( wxNumberFormatter::FromString("12,345", &l) );
|
||||
CHECK( l == 12345 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("1,234,567", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 1234567, l );
|
||||
CHECK( wxNumberFormatter::FromString("123,456", &l) );
|
||||
CHECK( l == 123456 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("1,234,567", &l) );
|
||||
CHECK( l == 1234567 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("-123", &l) );
|
||||
CHECK( l == -123 );
|
||||
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("9223372036854775808", &l) );
|
||||
}
|
||||
|
||||
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
|
||||
void NumFormatterTestCase::LongLongFromString()
|
||||
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::LongLongFromString", "[numformatter]")
|
||||
{
|
||||
if ( !m_locale )
|
||||
if ( !CanRunTest() )
|
||||
return;
|
||||
|
||||
WX_ASSERT_FAILS_WITH_ASSERT
|
||||
@@ -278,34 +212,97 @@ void NumFormatterTestCase::LongLongFromString()
|
||||
);
|
||||
|
||||
wxLongLong_t l;
|
||||
CPPUNIT_ASSERT( !wxNumberFormatter::FromString("", &l) );
|
||||
CPPUNIT_ASSERT( !wxNumberFormatter::FromString("foo", &l) );
|
||||
CPPUNIT_ASSERT( !wxNumberFormatter::FromString("1.234", &l) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("", &l) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("foo", &l) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("1.234", &l) );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123, l );
|
||||
// This somehow succeeds with gcc 4.8.4 under Ubuntu and MinGW 5.3, so
|
||||
// don't use CHECK() for it.
|
||||
if ( wxNumberFormatter::FromString("-", &l) )
|
||||
{
|
||||
WARN("Converting \"-\" to long long unexpectedly succeeded, result: " << l);
|
||||
}
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("1234", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 1234, l );
|
||||
CHECK( wxNumberFormatter::FromString("0", &l) );
|
||||
CHECK( l == 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("1,234", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 1234, l );
|
||||
CHECK( wxNumberFormatter::FromString("123", &l) );
|
||||
CHECK( l == 123 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("12,345", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 12345, l );
|
||||
CHECK( wxNumberFormatter::FromString("1234", &l) );
|
||||
CHECK( l == 1234 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123,456", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123456, l );
|
||||
CHECK( wxNumberFormatter::FromString("1,234", &l) );
|
||||
CHECK( l == 1234 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("1,234,567", &l) );
|
||||
CPPUNIT_ASSERT_EQUAL( 1234567, l );
|
||||
CHECK( wxNumberFormatter::FromString("12,345", &l) );
|
||||
CHECK( l == 12345 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("123,456", &l) );
|
||||
CHECK( l == 123456 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("1,234,567", &l) );
|
||||
CHECK( l == 1234567 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("-123", &l) );
|
||||
CHECK( l == -123 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("9223372036854775807", &l) );
|
||||
CHECK( l == wxINT64_MAX );
|
||||
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("9223372036854775808", &l) );
|
||||
}
|
||||
|
||||
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
|
||||
|
||||
void NumFormatterTestCase::DoubleFromString()
|
||||
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::ULongLongFromString", "[numformatter]")
|
||||
{
|
||||
if ( !m_locale )
|
||||
if ( !CanRunTest() )
|
||||
return;
|
||||
|
||||
wxULongLong_t u;
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("", &u) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("bar", &u) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("1.234", &u) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("-2", &u) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("-", &u) );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("0", &u) );
|
||||
CHECK( u == 0 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("123", &u) );
|
||||
CHECK( u == 123 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("1234", &u) );
|
||||
CHECK( u == 1234 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("1,234", &u) );
|
||||
CHECK( u == 1234 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("12,345", &u) );
|
||||
CHECK( u == 12345 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("123,456", &u) );
|
||||
CHECK( u == 123456 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("1,234,567", &u) );
|
||||
CHECK( u == 1234567 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("9223372036854775807", &u) );
|
||||
CHECK( u == static_cast<wxULongLong_t>(wxINT64_MAX) );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("9223372036854775808", &u) );
|
||||
CHECK( u == static_cast<wxULongLong_t>(wxINT64_MAX) + 1 );
|
||||
|
||||
CHECK( wxNumberFormatter::FromString("18446744073709551615", &u) );
|
||||
CHECK( u == wxUINT64_MAX );
|
||||
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("18446744073709551616", &u) );
|
||||
}
|
||||
|
||||
TEST_CASE_METHOD(NumFormatterTestCase, "NumFormatter::DoubleFromString", "[numformatter]")
|
||||
{
|
||||
if ( !CanRunTest() )
|
||||
return;
|
||||
|
||||
WX_ASSERT_FAILS_WITH_ASSERT
|
||||
@@ -314,33 +311,33 @@ void NumFormatterTestCase::DoubleFromString()
|
||||
);
|
||||
|
||||
double d;
|
||||
CPPUNIT_ASSERT( !wxNumberFormatter::FromString("", &d) );
|
||||
CPPUNIT_ASSERT( !wxNumberFormatter::FromString("bar", &d) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("", &d) );
|
||||
CHECK_FALSE( wxNumberFormatter::FromString("bar", &d) );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123., d );
|
||||
CHECK( wxNumberFormatter::FromString("123", &d) );
|
||||
CHECK( d == 123. );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123.456789012", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123.456789012, d );
|
||||
CHECK( wxNumberFormatter::FromString("123.456789012", &d) );
|
||||
CHECK( d == 123.456789012 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("1,234.56789012", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 1234.56789012, d );
|
||||
CHECK( wxNumberFormatter::FromString("1,234.56789012", &d) );
|
||||
CHECK( d == 1234.56789012 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("12,345.6789012", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 12345.6789012, d );
|
||||
CHECK( wxNumberFormatter::FromString("12,345.6789012", &d) );
|
||||
CHECK( d == 12345.6789012 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123,456.789012", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123456.789012, d );
|
||||
CHECK( wxNumberFormatter::FromString("123,456.789012", &d) );
|
||||
CHECK( d == 123456.789012 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("1,234,567.89012", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 1234567.89012, d );
|
||||
CHECK( wxNumberFormatter::FromString("1,234,567.89012", &d) );
|
||||
CHECK( d == 1234567.89012 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("12,345,678.9012", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 12345678.9012, d );
|
||||
CHECK( wxNumberFormatter::FromString("12,345,678.9012", &d) );
|
||||
CHECK( d == 12345678.9012 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123,456,789.012", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123456789.012, d );
|
||||
CHECK( wxNumberFormatter::FromString("123,456,789.012", &d) );
|
||||
CHECK( d == 123456789.012 );
|
||||
|
||||
CPPUNIT_ASSERT( wxNumberFormatter::FromString("123456789.012", &d) );
|
||||
CPPUNIT_ASSERT_EQUAL( 123456789.012, d );
|
||||
CHECK( wxNumberFormatter::FromString("123456789.012", &d) );
|
||||
CHECK( d == 123456789.012 );
|
||||
}
|
||||
|
||||
@@ -20,116 +20,144 @@
|
||||
|
||||
#include "asserthelper.h"
|
||||
#include "testableframe.h"
|
||||
|
||||
#include "wx/scopeguard.h"
|
||||
#include "wx/uiaction.h"
|
||||
|
||||
class NumValidatorTestCase : public CppUnit::TestCase
|
||||
class NumValidatorTestCase
|
||||
{
|
||||
public:
|
||||
NumValidatorTestCase() { }
|
||||
NumValidatorTestCase();
|
||||
~NumValidatorTestCase();
|
||||
|
||||
void setUp() wxOVERRIDE;
|
||||
void tearDown() wxOVERRIDE;
|
||||
|
||||
private:
|
||||
CPPUNIT_TEST_SUITE( NumValidatorTestCase );
|
||||
CPPUNIT_TEST( TransferInt );
|
||||
CPPUNIT_TEST( TransferUnsigned );
|
||||
CPPUNIT_TEST( TransferFloat );
|
||||
CPPUNIT_TEST( ZeroAsBlank );
|
||||
CPPUNIT_TEST( NoTrailingZeroes );
|
||||
WXUISIM_TEST( Interactive );
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
void TransferInt();
|
||||
void TransferUnsigned();
|
||||
void TransferFloat();
|
||||
void ZeroAsBlank();
|
||||
void NoTrailingZeroes();
|
||||
#if wxUSE_UIACTIONSIMULATOR
|
||||
void Interactive();
|
||||
#endif // wxUSE_UIACTIONSIMULATOR
|
||||
|
||||
wxTextCtrl *m_text;
|
||||
protected:
|
||||
wxTextCtrl* const m_text;
|
||||
|
||||
wxDECLARE_NO_COPY_CLASS(NumValidatorTestCase);
|
||||
};
|
||||
|
||||
// register in the unnamed registry so that these tests are run by default
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION( NumValidatorTestCase );
|
||||
|
||||
// also include in its own registry so that these tests can be run alone
|
||||
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NumValidatorTestCase, "NumValidatorTestCase" );
|
||||
|
||||
void NumValidatorTestCase::setUp()
|
||||
NumValidatorTestCase::NumValidatorTestCase()
|
||||
: m_text(new wxTextCtrl(wxTheApp->GetTopWindow(), wxID_ANY))
|
||||
{
|
||||
m_text = new wxTextCtrl(wxTheApp->GetTopWindow(), wxID_ANY);
|
||||
}
|
||||
|
||||
void NumValidatorTestCase::tearDown()
|
||||
NumValidatorTestCase::~NumValidatorTestCase()
|
||||
{
|
||||
wxTheApp->GetTopWindow()->DestroyChildren();
|
||||
delete m_text;
|
||||
}
|
||||
|
||||
void NumValidatorTestCase::TransferInt()
|
||||
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferInt", "[valnum]")
|
||||
{
|
||||
int value = 0;
|
||||
wxIntegerValidator<int> valInt(&value);
|
||||
valInt.SetWindow(m_text);
|
||||
|
||||
CPPUNIT_ASSERT( valInt.TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "0", m_text->GetValue() );
|
||||
CHECK( valInt.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "0" );
|
||||
|
||||
value = 17;
|
||||
CPPUNIT_ASSERT( valInt.TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "17", m_text->GetValue() );
|
||||
CHECK( valInt.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "17" );
|
||||
|
||||
|
||||
m_text->ChangeValue("foobar");
|
||||
CPPUNIT_ASSERT( !valInt.TransferFromWindow() );
|
||||
CHECK( !valInt.TransferFromWindow() );
|
||||
|
||||
m_text->ChangeValue("-234");
|
||||
CPPUNIT_ASSERT( valInt.TransferFromWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( -234, value );
|
||||
CHECK( valInt.TransferFromWindow() );
|
||||
CHECK( value == -234 );
|
||||
|
||||
m_text->ChangeValue("9223372036854775808"); // == LLONG_MAX + 1
|
||||
CPPUNIT_ASSERT( !valInt.TransferFromWindow() );
|
||||
CHECK( !valInt.TransferFromWindow() );
|
||||
|
||||
m_text->Clear();
|
||||
CPPUNIT_ASSERT( !valInt.TransferFromWindow() );
|
||||
CHECK( !valInt.TransferFromWindow() );
|
||||
}
|
||||
|
||||
void NumValidatorTestCase::TransferUnsigned()
|
||||
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferUnsigned", "[valnum]")
|
||||
{
|
||||
unsigned value = 0;
|
||||
wxIntegerValidator<unsigned> valUnsigned(&value);
|
||||
valUnsigned.SetWindow(m_text);
|
||||
|
||||
CPPUNIT_ASSERT( valUnsigned.TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "0", m_text->GetValue() );
|
||||
CHECK( valUnsigned.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "0" );
|
||||
|
||||
value = 17;
|
||||
CPPUNIT_ASSERT( valUnsigned.TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "17", m_text->GetValue() );
|
||||
CHECK( valUnsigned.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "17" );
|
||||
|
||||
|
||||
m_text->ChangeValue("foobar");
|
||||
CPPUNIT_ASSERT( !valUnsigned.TransferFromWindow() );
|
||||
CHECK( !valUnsigned.TransferFromWindow() );
|
||||
|
||||
m_text->ChangeValue("-234");
|
||||
CPPUNIT_ASSERT( !valUnsigned.TransferFromWindow() );
|
||||
CHECK( !valUnsigned.TransferFromWindow() );
|
||||
|
||||
m_text->ChangeValue("234");
|
||||
CPPUNIT_ASSERT( valUnsigned.TransferFromWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( 234, value );
|
||||
CHECK( valUnsigned.TransferFromWindow() );
|
||||
CHECK( value == 234 );
|
||||
|
||||
m_text->ChangeValue("4294967295"); // == ULONG_MAX in 32 bits
|
||||
CHECK( valUnsigned.TransferFromWindow() );
|
||||
CHECK( value == wxUINT32_MAX );
|
||||
CHECK( valUnsigned.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "4294967295" );
|
||||
|
||||
m_text->ChangeValue("4294967296"); // == ULONG_MAX + 1
|
||||
CHECK( !valUnsigned.TransferFromWindow() );
|
||||
|
||||
m_text->ChangeValue("18446744073709551616"); // == ULLONG_MAX + 1
|
||||
CPPUNIT_ASSERT( !valUnsigned.TransferFromWindow() );
|
||||
CHECK( !valUnsigned.TransferFromWindow() );
|
||||
|
||||
m_text->Clear();
|
||||
CPPUNIT_ASSERT( !valUnsigned.TransferFromWindow() );
|
||||
CHECK( !valUnsigned.TransferFromWindow() );
|
||||
}
|
||||
|
||||
void NumValidatorTestCase::TransferFloat()
|
||||
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferULL", "[valnum]")
|
||||
{
|
||||
unsigned long long value = 0;
|
||||
wxIntegerValidator<unsigned long long> valULL(&value);
|
||||
valULL.SetWindow(m_text);
|
||||
|
||||
SECTION("LLONG_MAX")
|
||||
{
|
||||
m_text->ChangeValue("9223372036854775807"); // == LLONG_MAX
|
||||
REQUIRE( valULL.TransferFromWindow() );
|
||||
CHECK( value == static_cast<wxULongLong_t>(wxINT64_MAX) );
|
||||
|
||||
REQUIRE( valULL.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "9223372036854775807" );
|
||||
}
|
||||
|
||||
SECTION("LLONG_MAX+1")
|
||||
{
|
||||
m_text->ChangeValue("9223372036854775808"); // == LLONG_MAX + 1
|
||||
REQUIRE( valULL.TransferFromWindow() );
|
||||
CHECK( value == static_cast<wxULongLong_t>(wxINT64_MAX) + 1 );
|
||||
|
||||
REQUIRE( valULL.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "9223372036854775808" );
|
||||
}
|
||||
|
||||
SECTION("ULLONG_MAX")
|
||||
{
|
||||
m_text->ChangeValue("18446744073709551615"); // == ULLONG_MAX
|
||||
REQUIRE( valULL.TransferFromWindow() );
|
||||
CHECK( value == wxUINT64_MAX );
|
||||
|
||||
REQUIRE( valULL.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "18446744073709551615" );
|
||||
}
|
||||
|
||||
SECTION("ULLONG_MAX+1")
|
||||
{
|
||||
m_text->ChangeValue("18446744073709551616"); // == ULLONG_MAX + 1
|
||||
CHECK( !valULL.TransferFromWindow() );
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::TransferFloat", "[valnum]")
|
||||
{
|
||||
// We need a locale with point as decimal separator.
|
||||
wxLocale loc(wxLANGUAGE_ENGLISH_UK, wxLOCALE_DONT_LOAD_DEFAULT);
|
||||
@@ -138,30 +166,30 @@ void NumValidatorTestCase::TransferFloat()
|
||||
wxFloatingPointValidator<float> valFloat(3, &value);
|
||||
valFloat.SetWindow(m_text);
|
||||
|
||||
CPPUNIT_ASSERT( valFloat.TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "0.000", m_text->GetValue() );
|
||||
CHECK( valFloat.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "0.000" );
|
||||
|
||||
value = 1.234f;
|
||||
CPPUNIT_ASSERT( valFloat.TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "1.234", m_text->GetValue() );
|
||||
CHECK( valFloat.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "1.234" );
|
||||
|
||||
value = 1.2345678f;
|
||||
CPPUNIT_ASSERT( valFloat.TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "1.235", m_text->GetValue() );
|
||||
CHECK( valFloat.TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "1.235" );
|
||||
|
||||
|
||||
m_text->ChangeValue("foobar");
|
||||
CPPUNIT_ASSERT( !valFloat.TransferFromWindow() );
|
||||
CHECK( !valFloat.TransferFromWindow() );
|
||||
|
||||
m_text->ChangeValue("-234.567");
|
||||
CPPUNIT_ASSERT( valFloat.TransferFromWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( -234.567f, value );
|
||||
CHECK( valFloat.TransferFromWindow() );
|
||||
CHECK( value == -234.567f );
|
||||
|
||||
m_text->Clear();
|
||||
CPPUNIT_ASSERT( !valFloat.TransferFromWindow() );
|
||||
CHECK( !valFloat.TransferFromWindow() );
|
||||
}
|
||||
|
||||
void NumValidatorTestCase::ZeroAsBlank()
|
||||
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::ZeroAsBlank", "[valnum]")
|
||||
{
|
||||
long value = 0;
|
||||
m_text->SetValidator(
|
||||
@@ -169,15 +197,15 @@ void NumValidatorTestCase::ZeroAsBlank()
|
||||
|
||||
wxValidator * const val = m_text->GetValidator();
|
||||
|
||||
CPPUNIT_ASSERT( val->TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "", m_text->GetValue() );
|
||||
CHECK( val->TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "" );
|
||||
|
||||
value++;
|
||||
CPPUNIT_ASSERT( val->TransferFromWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( 0, value );
|
||||
CHECK( val->TransferFromWindow() );
|
||||
CHECK( value == 0 );
|
||||
}
|
||||
|
||||
void NumValidatorTestCase::NoTrailingZeroes()
|
||||
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::NoTrailingZeroes", "[valnum]")
|
||||
{
|
||||
// We need a locale with point as decimal separator.
|
||||
wxLocale loc(wxLANGUAGE_ENGLISH_UK, wxLOCALE_DONT_LOAD_DEFAULT);
|
||||
@@ -188,17 +216,17 @@ void NumValidatorTestCase::NoTrailingZeroes()
|
||||
|
||||
wxValidator * const val = m_text->GetValidator();
|
||||
|
||||
CPPUNIT_ASSERT( val->TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "1.2", m_text->GetValue() );
|
||||
CHECK( val->TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "1.2" );
|
||||
|
||||
value = 1.234;
|
||||
CPPUNIT_ASSERT( val->TransferToWindow() );
|
||||
CPPUNIT_ASSERT_EQUAL( "1.234", m_text->GetValue() );
|
||||
CHECK( val->TransferToWindow() );
|
||||
CHECK( m_text->GetValue() == "1.234" );
|
||||
}
|
||||
|
||||
#if wxUSE_UIACTIONSIMULATOR
|
||||
|
||||
void NumValidatorTestCase::Interactive()
|
||||
TEST_CASE_METHOD(NumValidatorTestCase, "ValNum::Interactive", "[valnum]")
|
||||
{
|
||||
#ifdef __WXMSW__
|
||||
// FIXME: This test fails on MSW buildbot slaves although works fine on
|
||||
@@ -217,6 +245,7 @@ void NumValidatorTestCase::Interactive()
|
||||
// Create a sibling text control to be able to switch focus and thus
|
||||
// trigger the control validation/normalization.
|
||||
wxTextCtrl * const text2 = new wxTextCtrl(m_text->GetParent(), wxID_ANY);
|
||||
wxON_BLOCK_EXIT_OBJ0( *text2, wxWindow::Destroy );
|
||||
text2->Move(10, 80); // Just to see it better while debugging...
|
||||
wxFloatingPointValidator<float> valFloat(3);
|
||||
valFloat.SetRange(-10., 10.);
|
||||
@@ -228,12 +257,12 @@ void NumValidatorTestCase::Interactive()
|
||||
m_text->SetFocus();
|
||||
sim.Char('-');
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "", m_text->GetValue() );
|
||||
CHECK( m_text->GetValue() == "" );
|
||||
|
||||
// Neither is entering '.' or any non-digit character.
|
||||
sim.Text(".a+/");
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "", m_text->GetValue() );
|
||||
CHECK( m_text->GetValue() == "" );
|
||||
|
||||
// Entering digits should work though and after leaving the control the
|
||||
// contents should be normalized.
|
||||
@@ -242,43 +271,43 @@ void NumValidatorTestCase::Interactive()
|
||||
text2->SetFocus();
|
||||
wxYield();
|
||||
if ( loc.IsOk() )
|
||||
CPPUNIT_ASSERT_EQUAL( "1,234,567", m_text->GetValue() );
|
||||
CHECK( m_text->GetValue() == "1,234,567" );
|
||||
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
|
||||
// correct order.
|
||||
sim.Char('-');
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "-", text2->GetValue() );
|
||||
CHECK( text2->GetValue() == "-" );
|
||||
|
||||
text2->SetInsertionPoint(0);
|
||||
sim.Char('.');
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "-", text2->GetValue() );
|
||||
CHECK( text2->GetValue() == "-" );
|
||||
|
||||
text2->SetInsertionPointEnd();
|
||||
sim.Char('.');
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "-.", text2->GetValue() );
|
||||
CHECK( text2->GetValue() == "-." );
|
||||
|
||||
// Adding up to three digits after the point should work.
|
||||
sim.Text("987");
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "-.987", text2->GetValue() );
|
||||
CHECK( text2->GetValue() == "-.987" );
|
||||
|
||||
// But no more.
|
||||
sim.Text("654");
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "-.987", text2->GetValue() );
|
||||
CHECK( text2->GetValue() == "-.987" );
|
||||
|
||||
// We can remove one digit and another one though.
|
||||
sim.Char(WXK_BACK);
|
||||
sim.Char(WXK_BACK);
|
||||
sim.Char('6');
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "-.96", text2->GetValue() );
|
||||
CHECK( text2->GetValue() == "-.96" );
|
||||
|
||||
|
||||
// Also test the range constraint.
|
||||
@@ -286,11 +315,11 @@ void NumValidatorTestCase::Interactive()
|
||||
|
||||
sim.Char('9');
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "9", text2->GetValue() );
|
||||
CHECK( text2->GetValue() == "9" );
|
||||
|
||||
sim.Char('9');
|
||||
wxYield();
|
||||
CPPUNIT_ASSERT_EQUAL( "9", text2->GetValue() );
|
||||
CHECK( text2->GetValue() == "9" );
|
||||
}
|
||||
|
||||
#endif // wxUSE_UIACTIONSIMULATOR
|
||||
|
||||
Reference in New Issue
Block a user