diff options
Diffstat (limited to 'sc/qa/unit/helper/qahelper.cxx')
| -rw-r--r-- | sc/qa/unit/helper/qahelper.cxx | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index cf44e3908970..654df89b0308 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -423,44 +423,25 @@ ScTokenArray* getTokens(ScDocument& rDoc, const ScAddress& rPos) } -void checkFormula(ScDocument& rDoc, const ScAddress& rPos, const char* pExpected, const char * pFailMessage, bool& rPass) +bool checkFormula(ScDocument& rDoc, const ScAddress& rPos, const char* pExpected) { - rPass = true; ScTokenArray* pCode = getTokens(rDoc, rPos); if (!pCode) { cerr << "Empty token array." << endl; - rPass = false; - CPPUNIT_FAIL(pFailMessage); + return false; } OUString aFormula = toString(rDoc, rPos, *pCode, rDoc.GetGrammar()); if (aFormula != OUString::createFromAscii(pExpected)) { - CPPUNIT_ASSERT_EQUAL_MESSAGE("The expected and actual value differ.", OUString::createFromAscii(pExpected), aFormula); - CPPUNIT_FAIL(pFailMessage); - rPass = false; - } -} - -void checkFormula(ScDocument& rDoc, const ScAddress& rPos, const char* pExpected, const char * pFailMessage) -{ - ScTokenArray* pCode = getTokens(rDoc, rPos); - if (!pCode) - { - cerr << "Empty token array." << endl; - CPPUNIT_FAIL(pFailMessage); + cerr << "Formula '" << pExpected << "' expected, but '" << aFormula << "' found" << endl; + return false; } - OUString aFormula = toString(rDoc, rPos, *pCode, rDoc.GetGrammar()); - if (aFormula != OUString::createFromAscii(pExpected)) - { - CPPUNIT_ASSERT_EQUAL_MESSAGE("The expected and actual value differ.", OUString::createFromAscii(pExpected), aFormula); - CPPUNIT_FAIL(pFailMessage); - } + return true; } - bool checkFormulaPosition(ScDocument& rDoc, const ScAddress& rPos) { OUString aStr(rPos.Format(SCA_VALID)); |