diff --git a/qa/qa_utils/include/qa_utils/wx_utils/wx_assert.h b/qa/qa_utils/include/qa_utils/wx_utils/wx_assert.h index 33545274d4..2bcd826b43 100644 --- a/qa/qa_utils/include/qa_utils/wx_utils/wx_assert.h +++ b/qa/qa_utils/include/qa_utils/wx_utils/wx_assert.h @@ -62,6 +62,18 @@ public: std::string m_format_msg; }; + +/* + * Simple function to handle a WX assertion and throw a real exception. + * + * This is useful when you want to check assertions fire in unit tests. + */ +inline void wxAssertThrower( const wxString& aFile, int aLine, const wxString& aFunc, + const wxString& aCond, const wxString& aMsg ) +{ + throw KI_TEST::WX_ASSERT_ERROR( aFile, aLine, aFunc, aCond, aMsg ); +} + } // namespace KI_TEST #endif // UNIT_TEST_UTILS_WX_ASSERT__H \ No newline at end of file diff --git a/qa/tests/api/test_api_module.cpp b/qa/tests/api/test_api_module.cpp index bc995a851b..0ebc88ccf5 100644 --- a/qa/tests/api/test_api_module.cpp +++ b/qa/tests/api/test_api_module.cpp @@ -22,13 +22,6 @@ #include -void wxAssertThrower( const wxString& aFile, int aLine, const wxString& aFunc, - const wxString& aCond, const wxString& aMsg ) -{ - throw KI_TEST::WX_ASSERT_ERROR( aFile, aLine, aFunc, aCond, aMsg ); -} - - bool init_unit_test() { boost::unit_test::framework::master_test_suite().p_name.value = "IPC API tests"; @@ -38,7 +31,7 @@ bool init_unit_test() bool ok = wxInitialize( boost::unit_test::framework::master_test_suite().argc, boost::unit_test::framework::master_test_suite().argv ); - wxSetAssertHandler( &wxAssertThrower ); + wxSetAssertHandler( &KI_TEST::wxAssertThrower ); return ok; } diff --git a/qa/tests/eeschema/test_module.cpp b/qa/tests/eeschema/test_module.cpp index 6db986798d..d278635e7e 100644 --- a/qa/tests/eeschema/test_module.cpp +++ b/qa/tests/eeschema/test_module.cpp @@ -39,17 +39,6 @@ #include -/* - * Simple function to handle a WX assertion and throw a real exception. - * - * This is useful when you want to check assertions fire in unit tests. - */ -void wxAssertThrower( const wxString& aFile, int aLine, const wxString& aFunc, - const wxString& aCond, const wxString& aMsg ) -{ - throw KI_TEST::WX_ASSERT_ERROR( aFile, aLine, aFunc, aCond, aMsg ); -} - bool init_unit_test() { @@ -62,7 +51,7 @@ bool init_unit_test() bool ok = wxInitialize( boost::unit_test::framework::master_test_suite().argc, boost::unit_test::framework::master_test_suite().argv ); - wxSetAssertHandler( &wxAssertThrower ); + wxSetAssertHandler( &KI_TEST::wxAssertThrower ); Pgm().InitPgm( true, true, true ); Pgm().GetSettingsManager().RegisterSettings( new EESCHEMA_SETTINGS, false ); diff --git a/qa/tests/spice/test_module.cpp b/qa/tests/spice/test_module.cpp index 2b7ea6a54c..4d1f5e2a8c 100644 --- a/qa/tests/spice/test_module.cpp +++ b/qa/tests/spice/test_module.cpp @@ -39,17 +39,6 @@ #include -/* - * Simple function to handle a WX assertion and throw a real exception. - * - * This is useful when you want to check assertions fire in unit tests. - */ -void wxAssertThrower( const wxString& aFile, int aLine, const wxString& aFunc, - const wxString& aCond, const wxString& aMsg ) -{ - throw KI_TEST::WX_ASSERT_ERROR( aFile, aLine, aFunc, aCond, aMsg ); -} - bool init_unit_test() { @@ -62,7 +51,7 @@ bool init_unit_test() bool ok = wxInitialize( boost::unit_test::framework::master_test_suite().argc, boost::unit_test::framework::master_test_suite().argv ); - wxSetAssertHandler( &wxAssertThrower ); + wxSetAssertHandler( &KI_TEST::wxAssertThrower ); Pgm().InitPgm( true, true, true ); Pgm().GetSettingsManager().RegisterSettings( new EESCHEMA_SETTINGS, false );