mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not CPPUNIT_FAIL (which throws exceptions) from a destructor

Browse Source 
...this is a sure way to std::terminate

Change-Id: I8753b1b1d6594829ea529462aa0369e4f2f623d4
This commit is contained in:
Stephan Bergmann
2013-03-05 21:18:52 +01:00
parent e141af7d7f
commit ef8a6be49a
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
basic/qa/cppunit/basic_coverage.cxx
View File

@@ -22,7 +22,6 @@ private:
bool m_bError; bool m_bError;
int m_nb_tests; int m_nb_tests;
int m_nb_tests_ok; int m_nb_tests_ok;
int m_nb_tests_ko;
int m_nb_tests_skipped; int m_nb_tests_skipped;
OUString m_sCurrentTest; OUString m_sCurrentTest;
void process_directory(OUString sDirName); void process_directory(OUString sDirName);
@@ -65,18 +64,13 @@ Coverage::Coverage()
: m_bError(false) : m_bError(false)
, m_nb_tests(0) , m_nb_tests(0)
, m_nb_tests_ok(0) , m_nb_tests_ok(0)
, m_nb_tests_ko(0)
, m_nb_tests_skipped(0) , m_nb_tests_skipped(0)
{ {
} }
Coverage::~Coverage() Coverage::~Coverage()
{ {
fprintf(stderr,"basic coverage Summary : skipped:%d pass:%d failed:%d\n", m_nb_tests_skipped, m_nb_tests_ok, m_nb_tests_ko ); fprintf(stderr,"basic coverage Summary : skipped:%d pass:%d\n", m_nb_tests_skipped, m_nb_tests_ok );
if(m_nb_tests_ko)
{
CPPUNIT_FAIL("");
}
} }
void Coverage::test_start(OUString sFileName) void Coverage::test_start(OUString sFileName)
@@ -87,9 +81,8 @@ void Coverage::test_start(OUString sFileName)
void Coverage::test_failed() void Coverage::test_failed()
{ {
m_nb_tests_ko += 1; CPPUNIT_FAIL(
fprintf(stderr,"%s,FAIL\n", rtl::OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 ).getStr() ); OUStringToOString(m_sCurrentTest, RTL_TEXTENCODING_UTF8).getStr());
} }
void Coverage::test_success() void Coverage::test_success()