diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-07-02 04:30:26 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-07-02 06:34:43 +0200 |
| commit | 59d53910de13acfc2070e6240b936806af35c0a5 (patch) | |
| tree | 57aadd5299f99a70c3f2d82e7ca275ef827786ca /basic/qa | |
| parent | fc90f7ea8034e9585486ea9cc3e55771aca85540 (diff) | |
Small cleanup and simplification
Change-Id: I1e8a750832f365f080f6f60c81560dc942003049
Reviewed-on: https://gerrit.libreoffice.org/56788
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'basic/qa')
| -rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 24a65d02688f..9fea8e0dc064 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -156,13 +156,12 @@ void VBATest::testMiscVBAFunctions() MacroSnippet myMacro; myMacro.LoadSourceFromFile( sMacroURL ); SbxVariableRef pReturn = myMacro.Run(); - if ( pReturn.is() ) - { - fprintf(stderr, "macro result for %s\n", macroSource[ i ] ); - fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); - } - CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn.get() != nullptr ); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"), pReturn->GetOUString() ); + CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn.is()); + fprintf(stderr, "macro result for %s\n", macroSource[i]); + fprintf(stderr, "macro returned:\n%s\n", + OUStringToOString(pReturn->GetOUString(), RTL_TEXTENCODING_UTF8).getStr()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"), + pReturn->GetOUString()); } } @@ -234,13 +233,12 @@ void VBATest::testMiscOLEStuff() MacroSnippet myMacro; myMacro.LoadSourceFromFile( sMacroURL ); SbxVariableRef pReturn = myMacro.Run( aArgs ); - if ( pReturn.is() ) - { - fprintf(stderr, "macro result for %s\n", macroSource[ i ] ); - fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); - } - CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn.get() != nullptr ); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"), pReturn->GetOUString() ); + CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn.is()); + fprintf(stderr, "macro result for %s\n", macroSource[i]); + fprintf(stderr, "macro returned:\n%s\n", + OUStringToOString(pReturn->GetOUString(), RTL_TEXTENCODING_UTF8).getStr()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"), + pReturn->GetOUString()); } #else // Avoid "this method is empty and should be removed" warning |