X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3942aa77f5f737e668137a09ee197c7099c45a9e..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/tests/any/anytest.cpp?ds=inline diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp index 3981f3d69d..29dd5170a9 100644 --- a/tests/any/anytest.cpp +++ b/tests/any/anytest.cpp @@ -306,14 +306,6 @@ void wxAnyTestCase::Null() void wxAnyTestCase::GetAs() { - // FIXME: Parts of this test result in heap corruption in wxOSX/PPC builds - // for some unknown reason, disable them to at least allow running - // the other tests. -#if defined(__WXOSX__) && defined(__POWERPC__) - #warning "Disabling some tests under PPC, please consider debugging them." - #define wxDONT_TEST -#endif // OSX/PPC - // // Test dynamic conversion bool res; @@ -364,9 +356,7 @@ void wxAnyTestCase::GetAs() // should not work. CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&l)); CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&ul)); -#ifndef wxDONT_TEST CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&f)); -#endif // !wxDONT_TEST CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&b)); // Let's test some other conversions from string that should work. @@ -379,11 +369,9 @@ void wxAnyTestCase::GetAs() res = anyString.GetAs(&ul); CPPUNIT_ASSERT(res); CPPUNIT_ASSERT_EQUAL(ul, static_cast(15)); -#ifndef wxDONT_TEST res = anyString.GetAs(&f); CPPUNIT_ASSERT(res); CPPUNIT_ASSERT_DOUBLES_EQUAL(f, 15.0, FEQ_DELTA); -#endif // !wxDONT_TEST anyString = "TRUE"; res = anyString.GetAs(&b); CPPUNIT_ASSERT(res); @@ -414,12 +402,10 @@ void wxAnyTestCase::GetAs() CPPUNIT_ASSERT_EQUAL(ul, static_cast(123)); res = m_anyDoubleDouble1.GetAs(&s); CPPUNIT_ASSERT(res); -#ifndef wxDONT_TEST double d2; - res = s.ToDouble(&d2); + res = s.ToCDouble(&d2); CPPUNIT_ASSERT(res); CPPUNIT_ASSERT_DOUBLES_EQUAL(d2, TEST_FLOAT_CONST, FEQ_DELTA); -#endif // !wxDONT_TEST }