diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-31 13:20:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 09:14:25 +0200 |
| commit | 23b08449736ba825a9c582ba18b7a5fdba178e47 (patch) | |
| tree | 8513c824f1964f84f957a41658f6d173a008c469 | |
| parent | Move signature line to signed properties (diff) | |
| download | core-23b08449736ba825a9c582ba18b7a5fdba178e47.tar.gz core-23b08449736ba825a9c582ba18b7a5fdba178e47.zip | |
loplugin: look for CPPUNIT_ASSERT_EQUALS with params swapped
idea originally from either tml or moggi, can't remember which
Change-Id: Id78d75035036d3aa1666e33469c6eeb38f9e624d
Reviewed-on: https://gerrit.libreoffice.org/55126
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
50 files changed, 630 insertions, 554 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index b77aeda6755b..c43433d690a9 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -271,7 +271,7 @@ void testErrorBar( Reference< XPropertySet > const & xErrorBar ) sal_Int32 nErrorBarStyle; CPPUNIT_ASSERT( xErrorBar->getPropertyValue("ErrorBarStyle") >>= nErrorBarStyle); - CPPUNIT_ASSERT_EQUAL(nErrorBarStyle, chart::ErrorBarStyle::RELATIVE); + CPPUNIT_ASSERT_EQUAL(chart::ErrorBarStyle::RELATIVE, nErrorBarStyle); bool bShowPositive = bool(), bShowNegative = bool(); CPPUNIT_ASSERT( xErrorBar->getPropertyValue("ShowPositiveError") >>= bShowPositive); diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 04d66e259993..4f065d27161e 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -245,11 +245,11 @@ void Chart2ImportTest::Fdo60083() bool bVal; CPPUNIT_ASSERT( xErrorBarYProps->getPropertyValue("ShowPositiveError") >>= bVal); - CPPUNIT_ASSERT_EQUAL(bVal, true); + CPPUNIT_ASSERT_EQUAL(true, bVal); CPPUNIT_ASSERT( xErrorBarYProps->getPropertyValue("ShowNegativeError") >>= bVal); - CPPUNIT_ASSERT_EQUAL(bVal, true); + CPPUNIT_ASSERT_EQUAL(true, bVal); } // test that x error bars are not imported @@ -285,7 +285,7 @@ void Chart2ImportTest::testErrorBarRange() OUString aRangePos; CPPUNIT_ASSERT(xErrorBarYProps->getPropertyValue("ErrorBarRangePositive") >>= aRangePos); - CPPUNIT_ASSERT_EQUAL(aRangePos, OUString("$Sheet1.$C$2:$C$4")); + CPPUNIT_ASSERT_EQUAL(OUString("$Sheet1.$C$2:$C$4"), aRangePos); } void Chart2ImportTest::testErrorBarFormatting() @@ -696,7 +696,7 @@ void Chart2ImportTest::testBnc889755() uno::Reference< chart2::XInternalDataProvider > xDataProvider( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW ); uno::Reference< chart::XChartDataArray > xChartDataArray(xDataProvider, uno::UNO_QUERY_THROW); uno::Sequence< OUString > aRowLabels = xChartDataArray->getRowDescriptions(); - CPPUNIT_ASSERT_EQUAL( aRowLabels.getLength(), sal_Int32(16) ); + CPPUNIT_ASSERT_EQUAL(sal_Int32(16), aRowLabels.getLength()); CPPUNIT_ASSERT_EQUAL(OUString("Oct-12"), aRowLabels[0]); CPPUNIT_ASSERT_EQUAL(OUString("Nov-12"), aRowLabels[1]); CPPUNIT_ASSERT_EQUAL(OUString("Dec-12"), aRowLabels[2]); @@ -807,14 +807,14 @@ void Chart2ImportTest::testTdf105517() long lineColor; xPropSet1->getPropertyValue("Color") >>= lineColor; // incorrect line color was 0x4a7ebb due to not handling themeOverride - CPPUNIT_ASSERT_EQUAL(lineColor, long(0xeaa700)); + CPPUNIT_ASSERT_EQUAL(long(0xeaa700), lineColor); Reference<beans::XPropertySet> xPropSet2(xDSContainer->getDataSeries()[1], uno::UNO_QUERY); CPPUNIT_ASSERT(xPropSet2.is()); xPropSet2->getPropertyValue("Color") >>= lineColor; // incorrect line color was 0x98b855 - CPPUNIT_ASSERT_EQUAL(lineColor, long(0x1e69a8)); + CPPUNIT_ASSERT_EQUAL(long(0x1e69a8), lineColor); } void Chart2ImportTest::testTdf106217() @@ -829,14 +829,14 @@ void Chart2ImportTest::testTdf106217() CPPUNIT_ASSERT(xCircle.is()); uno::Reference<container::XNamed> xNamedShape(xCircle, uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xNamedShape->getName(), OUString("Oval 1")); + CPPUNIT_ASSERT_EQUAL(OUString("Oval 1"), xNamedShape->getName()); awt::Point aPosition = xCircle->getPosition(); - CPPUNIT_ASSERT_EQUAL(aPosition.X, sal_Int32(6870)); - CPPUNIT_ASSERT_EQUAL(aPosition.Y, sal_Int32(7261)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6870), aPosition.X); + CPPUNIT_ASSERT_EQUAL(sal_Int32(7261), aPosition.Y); awt::Size aSize = xCircle->getSize(); - CPPUNIT_ASSERT_EQUAL(aSize.Width, sal_Int32(2701)); - CPPUNIT_ASSERT_EQUAL(aSize.Height, sal_Int32(2700)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2701), aSize.Width); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2700), aSize.Height); } void Chart2ImportTest::testTransparentBackground(OUString const & filename) @@ -1054,7 +1054,7 @@ void Chart2ImportTest::testSmoothDefaultValue2007XLSX() chart2::CurveStyle eCurveStyle; xPropSet->getPropertyValue("CurveStyle") >>= eCurveStyle; - CPPUNIT_ASSERT_EQUAL(eCurveStyle, chart2::CurveStyle_LINES); + CPPUNIT_ASSERT_EQUAL(chart2::CurveStyle_LINES, eCurveStyle); } void Chart2ImportTest::testSmoothDefaultValue2013XLSX() diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx index caa54c55398f..cf38b4e45bfe 100644 --- a/comphelper/qa/container/comphelper_ifcontainer.cxx +++ b/comphelper/qa/container/comphelper_ifcontainer.cxx @@ -112,7 +112,7 @@ namespace comphelper_ifcontainer std::vector< Reference< XInterface > > aElements = pContainer->getElements(); CPPUNIT_ASSERT_EQUAL_MESSAGE("query contents", - static_cast<int>(aElements.size()), nTests); + nTests, static_cast<int>(aElements.size())); if (static_cast<int>(aElements.size()) == nTests) { for (i = 0; i < nTests; i++) diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 32a3e7c45e2f..8e4910cc6085 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -75,13 +75,13 @@ void TestString::testDecimalStringToNumber() void TestString::testIsdigitAsciiString() { OString s1("1234"); - CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s1), true); + CPPUNIT_ASSERT_EQUAL(true, comphelper::string::isdigitAsciiString(s1)); OString s2("1A34"); - CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s2), false); + CPPUNIT_ASSERT_EQUAL(false, comphelper::string::isdigitAsciiString(s2)); OString s3; - CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s3), true); + CPPUNIT_ASSERT_EQUAL(true, comphelper::string::isdigitAsciiString(s3)); } using namespace ::com::sun::star; diff --git a/compilerplugins/clang/cppunitassertequals.cxx b/compilerplugins/clang/cppunitassertequals.cxx index cff8908c7a46..39fa3d8989bf 100644 --- a/compilerplugins/clang/cppunitassertequals.cxx +++ b/compilerplugins/clang/cppunitassertequals.cxx @@ -10,9 +10,12 @@ #include "plugin.hxx" #include "check.hxx" #include "compat.hxx" +#include <iostream> /** - Check for calls to CPPUNIT_ASSERT when it should be using CPPUNIT_ASSERT_EQUALS + Check for + (*) calls to CPPUNIT_ASSERT when it should be using CPPUNIT_ASSERT_EQUALS + (*) calls to CPPUNIT_ASSERT_EQUALS where the constant is the second param */ namespace { @@ -38,69 +41,131 @@ private: SourceRange range, StringRef name, Expr const * expr, bool negated); void reportEquals(SourceRange range, StringRef name, bool negative); + + bool isCompileTimeConstant(Expr const * expr); }; bool CppunitAssertEquals::VisitCallExpr(const CallExpr* callExpr) { auto const decl = callExpr->getDirectCallee(); - if (decl == nullptr - || !(loplugin::DeclCheck(decl).Function("failIf").Struct("Asserter") - .Namespace("CppUnit").GlobalNamespace())) - { + if (!decl) return true; + /* + calls to CPPUNIT_ASSERT when it should be using CPPUNIT_ASSERT_EQUALS + */ + if (loplugin::DeclCheck(decl).Function("failIf").Struct("Asserter") + .Namespace("CppUnit").GlobalNamespace()) + { + // Don't use callExpr->getLocStart() or callExpr->getExprLoc(), as those + // fall into a nested use of the CPPUNIT_NS macro; CallExpr::getRParenLoc + // happens to be readily available and cause good results: + auto loc = callExpr->getRParenLoc(); + while (compiler.getSourceManager().isMacroArgExpansion(loc)) { + loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc); + } + if (!compiler.getSourceManager().isMacroBodyExpansion(loc) + || ignoreLocation( + compiler.getSourceManager().getImmediateMacroCallerLoc(loc))) + { + return true; + } + auto name = Lexer::getImmediateMacroName( + loc, compiler.getSourceManager(), compiler.getLangOpts()); + if (name != "CPPUNIT_ASSERT" && name != "CPPUNIT_ASSERT_MESSAGE") { + return true; + } + if (decl->getNumParams() != 3) { + report( + DiagnosticsEngine::Warning, + ("TODO: suspicious CppUnit::Asserter::failIf call with %0" + " parameters"), + callExpr->getExprLoc()) + << decl->getNumParams() << callExpr->getSourceRange(); + return true; + } + auto const e1 = callExpr->getArg(0)->IgnoreParenImpCasts(); + Expr const * e2 = nullptr; + if (auto const e3 = dyn_cast<UnaryOperator>(e1)) { + if (e3->getOpcode() == UO_LNot) { + e2 = e3->getSubExpr(); + } + } else if (auto const e4 = dyn_cast<CXXOperatorCallExpr>(e1)) { + if (e4->getOperator() == OO_Exclaim) { + e2 = e4->getArg(0); + } + } + if (e2 == nullptr) { + report( + DiagnosticsEngine::Warning, + ("TODO: suspicious CppUnit::Asserter::failIf call not wrapping" + " !(...)"), + callExpr->getExprLoc()) + << callExpr->getSourceRange(); + return true; + } + auto range = compat::getImmediateExpansionRange(compiler.getSourceManager(), loc); + checkExpr( + SourceRange(range.first, range.second), name, + e2->IgnoreParenImpCasts(), false); } - // Don't use callExpr->getLocStart() or callExpr->getExprLoc(), as those - // fall into a nested use of the CPPUNIT_NS macro; CallExpr::getRParenLoc - // happens to be readily available and cause good results: - auto loc = callExpr->getRParenLoc(); - while (compiler.getSourceManager().isMacroArgExpansion(loc)) { - loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc); - } - if (!compiler.getSourceManager().isMacroBodyExpansion(loc) - || ignoreLocation( - compiler.getSourceManager().getImmediateMacroCallerLoc(loc))) + + /** + Check for calls to CPPUNIT_ASSERT_EQUALS where the constant is the second param + */ + if (loplugin::DeclCheck(decl).Function("assertEquals"). + Namespace("CppUnit").GlobalNamespace()) { - return true; + // can happen in template test code that both params are compile time constants + if (isCompileTimeConstant(callExpr->getArg(0))) + return true; + if (isCompileTimeConstant(callExpr->getArg(1))) + report( + DiagnosticsEngine::Warning, + "CPPUNIT_ASSERT_EQUALS parameters look switched, expected value should be first param", + callExpr->getExprLoc()) + << callExpr->getSourceRange(); } - auto name = Lexer::getImmediateMacroName( - loc, compiler.getSourceManager(), compiler.getLangOpts()); - if (name != "CPPUNIT_ASSERT" && name != "CPPUNIT_ASSERT_MESSAGE") { - return true; + return true; +} + +// copied from stringconcat.cxx +Expr const * stripCtor(Expr const * expr) { + auto e0 = expr; + auto const e1 = dyn_cast<CXXFunctionalCastExpr>(e0); + if (e1 != nullptr) { + e0 = e1->getSubExpr()->IgnoreParenImpCasts(); } - if (decl->getNumParams() != 3) { - report( - DiagnosticsEngine::Warning, - ("TODO: suspicious CppUnit::Asserter::failIf call with %0" - " parameters"), - callExpr->getExprLoc()) - << decl->getNumParams() << callExpr->getSourceRange(); - return true; + auto const e2 = dyn_cast<CXXBindTemporaryExpr>(e0); + if (e2 == nullptr) { + return expr; } - auto const e1 = callExpr->getArg(0)->IgnoreParenImpCasts(); - Expr const * e2 = nullptr; - if (auto const e3 = dyn_cast<UnaryOperator>(e1)) { - if (e3->getOpcode() == UO_LNot) { - e2 = e3->getSubExpr(); - } - } else if (auto const e4 = dyn_cast<CXXOperatorCallExpr>(e1)) { - if (e4->getOperator() == OO_Exclaim) { - e2 = e4->getArg(0); - } + auto const e3 = dyn_cast<CXXConstructExpr>( + e2->getSubExpr()->IgnoreParenImpCasts()); + if (e3 == nullptr) { + return expr; } - if (e2 == nullptr) { - report( - DiagnosticsEngine::Warning, - ("TODO: suspicious CppUnit::Asserter::failIf call not wrapping" - " !(...)"), - callExpr->getExprLoc()) - << callExpr->getSourceRange(); - return true; + auto qt = loplugin::DeclCheck(e3->getConstructor()); + if (!((qt.MemberFunction().Class("OString").Namespace("rtl") + .GlobalNamespace()) + || (qt.MemberFunction().Class("OUString").Namespace("rtl") + .GlobalNamespace()))) + { + return expr; } - auto range = compat::getImmediateExpansionRange(compiler.getSourceManager(), loc); - checkExpr( - SourceRange(range.first, range.second), name, - e2->IgnoreParenImpCasts(), false); - return true; + if (e3->getNumArgs() != 2) { + return expr; + } + return e3->getArg(0)->IgnoreParenImpCasts(); +} + +bool CppunitAssertEquals::isCompileTimeConstant(Expr const * expr) +{ + if (expr->isIntegerConstantExpr(compiler.getASTContext())) + return true; + // is string literal ? + expr = expr->IgnoreParenImpCasts(); + expr = stripCtor(expr); + return isa<clang::StringLiteral>(expr); } void CppunitAssertEquals::checkExpr( diff --git a/compilerplugins/clang/test/cppunitassertequals.cxx b/compilerplugins/clang/test/cppunitassertequals.cxx index 239de58853b3..9448ddc02950 100644 --- a/compilerplugins/clang/test/cppunitassertequals.cxx +++ b/compilerplugins/clang/test/cppunitassertequals.cxx @@ -9,7 +9,10 @@ #include "sal/config.h" -#include "cppunit/TestAssert.h" +#include <cppunit/TestAssert.h> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> #include "cppunitassertequals.hxx" @@ -51,6 +54,15 @@ void test(bool b1, bool b2, OUString const & s1, OUString const & s2, T t) { CPPUNIT_ASSERT(bool(b1 && b2)); CPPUNIT_ASSERT(bool(b1 == b2)); CPPUNIT_ASSERT(bool(s1 == s2)); + + CPPUNIT_ASSERT_EQUAL(b1, true); // expected-error {{CPPUNIT_ASSERT_EQUALS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}} + CPPUNIT_ASSERT_EQUAL_MESSAGE("foo", b1, true); // expected-error {{CPPUNIT_ASSERT_EQUALS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}} + CPPUNIT_ASSERT_EQUAL(true, b1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("foo", true, b1); + CPPUNIT_ASSERT_EQUAL(s1, OUString("xxx")); // expected-error {{CPPUNIT_ASSERT_EQUALS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}} + CPPUNIT_ASSERT_EQUAL_MESSAGE("foo", s1, OUString("xxx")); // expected-error {{CPPUNIT_ASSERT_EQUALS parameters look switched, expected value should be first param [loplugin:cppunitassertequals]}} + CPPUNIT_ASSERT_EQUAL(OUString("xxx"), s1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("foo", OUString("xxx"), s1); } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 87802cba6b60..3919ed6c17ef 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -418,30 +418,30 @@ void Test::testBigStruct() { buffer[i] = '\x56'; } Guard guard(buffer.get()); - CPPUNIT_ASSERT_EQUAL(guard.p->m1, sal_False); - CPPUNIT_ASSERT_EQUAL(guard.p->m2, static_cast< sal_Int8 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m3, static_cast< sal_Int16 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m4, static_cast< sal_uInt16 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m5, static_cast< sal_Int32 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m6, static_cast< sal_uInt32 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m7, static_cast< sal_Int64 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m8, static_cast< sal_uInt64 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m9, 0.0f); - CPPUNIT_ASSERT_EQUAL(guard.p->m10, 0.0); - CPPUNIT_ASSERT_EQUAL(guard.p->m11, u'\0'); - CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0)); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(guard.p->m13.getTypeClass()), sal_Int32(css::uno::TypeClass_VOID)); - CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), false); - CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0)); - CPPUNIT_ASSERT_EQUAL(static_cast<int>(guard.p->m16), int(test::codemaker::cppumaker::HelperEnum_ZERO)); - CPPUNIT_ASSERT_EQUAL(guard.p->m17.m1, sal_False); - CPPUNIT_ASSERT_EQUAL(guard.p->m17.m2.is(), false); - CPPUNIT_ASSERT_EQUAL(guard.p->m18.is(), false); - CPPUNIT_ASSERT_EQUAL(guard.p->m19, static_cast< sal_Int8 >(0)); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(guard.p->m20), sal_Int32(test::codemaker::cppumaker::HelperEnum_ZERO)); - CPPUNIT_ASSERT_EQUAL(guard.p->m21.getLength(), static_cast< sal_Int32 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m22.getLength(), static_cast< sal_Int32 >(0)); - CPPUNIT_ASSERT_EQUAL(guard.p->m23.getLength(), static_cast< sal_Int32 >(0)); + CPPUNIT_ASSERT_EQUAL(sal_False, guard.p->m1); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int8 >(0), guard.p->m2); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int16 >(0), guard.p->m3); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt16 >(0), guard.p->m4); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), guard.p->m5); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(0), guard.p->m6); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int64 >(0), guard.p->m7); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt64 >(0), guard.p->m8); + CPPUNIT_ASSERT_EQUAL(0.0f, guard.p->m9); + CPPUNIT_ASSERT_EQUAL(0.0, guard.p->m10); + CPPUNIT_ASSERT_EQUAL( u'\0', guard.p->m11); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), guard.p->m12.getLength()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(css::uno::TypeClass_VOID), static_cast<sal_Int32>(guard.p->m13.getTypeClass())); + CPPUNIT_ASSERT_EQUAL(false, guard.p->m14.hasValue()); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), guard.p->m15.getLength()); + CPPUNIT_ASSERT_EQUAL(int(test::codemaker::cppumaker::HelperEnum_ZERO), static_cast<int>(guard.p->m16)); + CPPUNIT_ASSERT_EQUAL(sal_False, guard.p->m17.m1); + CPPUNIT_ASSERT_EQUAL(false, guard.p->m17.m2.is()); + CPPUNIT_ASSERT_EQUAL(false, guard.p->m18.is()); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int8 >(0), guard.p->m19); + CPPUNIT_ASSERT_EQUAL(sal_Int32(test::codemaker::cppumaker::HelperEnum_ZERO), static_cast<sal_Int32>(guard.p->m20)); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), guard.p->m21.getLength()); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), guard.p->m22.getLength()); + CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), guard.p->m23.getLength()); //This is a very platform specific test. #if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN @@ -482,9 +482,9 @@ void Test::testPolyStruct() { aEmptySequence; CPPUNIT_ASSERT_EQUAL( + static_cast< sal_uInt32 >(5), (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5, - aEmptySequence).member1), - static_cast< sal_uInt32 >(5)); + aEmptySequence).member1)); } void Test::testExceptions() { diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 51e048d04af4..1d41456adda8 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -813,8 +813,8 @@ void DesktopLOKTest::testCommandResult() std::stringstream aStream(m_aCommandResult.getStr()); boost::property_tree::read_json(aStream, aTree); - CPPUNIT_ASSERT_EQUAL(aTree.get_child("commandName").get_value<std::string>(), std::string(".uno:Bold")); - CPPUNIT_ASSERT_EQUAL(aTree.get_child("success").get_value<bool>(), true); + CPPUNIT_ASSERT_EQUAL(std::string(".uno:Bold"), aTree.get_child("commandName").get_value<std::string>()); + CPPUNIT_ASSERT_EQUAL(true, aTree.get_child("success").get_value<bool>()); comphelper::LibreOfficeKit::setActive(false); } @@ -909,7 +909,7 @@ void DesktopLOKTest::testSheetOperations() "{ \"Index\": { \"type\": \"long\", \"value\": 3 } }", false); Scheduler::ProcessEventsToIdle(); - CPPUNIT_ASSERT_EQUAL(pDocument->pClass->getParts(pDocument), 6); + CPPUNIT_ASSERT_EQUAL(6, pDocument->pClass->getParts(pDocument)); std::vector<OString> aExpected = { "FirstSheet", "Renamed", "Sheet3", "Sheet4", "Sheet5", "LastSheet" }; for (int i = 0; i < 6; ++i) @@ -2242,7 +2242,7 @@ void DesktopLOKTest::testExtractParameter() namespace { -size_t documentClassOffset(int i) +constexpr size_t documentClassOffset(int i) { return sizeof(static_cast<struct _LibreOfficeKitDocumentClass*>(nullptr)->nSize) + i * sizeof(void*); } diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index a945a20cbf03..ff00aba2e772 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -547,7 +547,7 @@ void TestLanguageTag::testAllTags() LanguageTag qtx( s_qtx ); qtx.setScriptType( LanguageTag::ScriptType::RTL ); LanguageType n_qtx = qtx.getLanguageType(); - CPPUNIT_ASSERT_EQUAL( MsLangId::getScriptType(n_qtx), css::i18n::ScriptType::COMPLEX ); + CPPUNIT_ASSERT_EQUAL( css::i18n::ScriptType::COMPLEX, MsLangId::getScriptType(n_qtx) ); CPPUNIT_ASSERT( MsLangId::isRightToLeft(n_qtx) ); CPPUNIT_ASSERT( !MsLangId::isCJK(n_qtx) ); } diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx index 70c902f71aaa..1fa1f3971ab4 100644 --- a/i18npool/qa/cppunit/test_characterclassification.cxx +++ b/i18npool/qa/cppunit/test_characterclassification.cxx @@ -80,7 +80,7 @@ void TestCharacterClassification::testStringType() //simple case OUString sTest("Some text"); sal_Int32 nResult = m_xCC->getStringType(sTest, 0, sTest.getLength(), aLocale); - CPPUNIT_ASSERT_EQUAL(nResult, sal_Int32(230)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(230), nResult); } { @@ -88,7 +88,7 @@ void TestCharacterClassification::testStringType() const sal_Unicode MATHEMATICAL_ITALIC_SMALL_THETA[] = { 0xD835, 0xDF03 }; OUString sTest(MATHEMATICAL_ITALIC_SMALL_THETA, SAL_N_ELEMENTS(MATHEMATICAL_ITALIC_SMALL_THETA)); sal_Int32 nResult = m_xCC->getStringType(sTest, 0, sTest.getLength(), aLocale); - CPPUNIT_ASSERT_EQUAL(nResult, sal_Int32(228)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(228), nResult); } } diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx index 3d81966ce46c..af8fa80c8b35 100644 --- a/o3tl/qa/test-cow_wrapper.cxx +++ b/o3tl/qa/test-cow_wrapper.cxx @@ -111,25 +111,25 @@ public: { aTestObj1 = cow_wrapper_client1( 1 ); - CPPUNIT_ASSERT_EQUAL(aTestObj1.queryUnmodified(), 1); + CPPUNIT_ASSERT_EQUAL(1, aTestObj1.queryUnmodified()); aTestObj2.modify( 2 ); - CPPUNIT_ASSERT_EQUAL(aTestObj2.queryUnmodified(), 2); + CPPUNIT_ASSERT_EQUAL(2, aTestObj2.queryUnmodified()); aTestObj3.modify( 3 ); - CPPUNIT_ASSERT_EQUAL(aTestObj3.queryUnmodified(), 3); + CPPUNIT_ASSERT_EQUAL(3, aTestObj3.queryUnmodified()); aTestObj4 = cow_wrapper_client2( 4 ); - CPPUNIT_ASSERT_EQUAL(aTestObj4.queryUnmodified(), 4); + CPPUNIT_ASSERT_EQUAL(4, aTestObj4.queryUnmodified()); aTestObj5.modify( 5 ); - CPPUNIT_ASSERT_EQUAL(aTestObj5.queryUnmodified(), 5); + CPPUNIT_ASSERT_EQUAL(5, aTestObj5.queryUnmodified()); aTestObj6.modify( 6 ); - CPPUNIT_ASSERT_EQUAL(aTestObj6.queryUnmodified(), 6); + CPPUNIT_ASSERT_EQUAL(6, aTestObj6.queryUnmodified()); aTestObj7 = cow_wrapper_client3( 7 ); - CPPUNIT_ASSERT_EQUAL(aTestObj7.queryUnmodified(), 7); + CPPUNIT_ASSERT_EQUAL(7, aTestObj7.queryUnmodified()); aTestObj8.modify( 8 ); - CPPUNIT_ASSERT_EQUAL(aTestObj8.queryUnmodified(), 8); + CPPUNIT_ASSERT_EQUAL(8, aTestObj8.queryUnmodified()); aTestObj9.modify( 9 ); - CPPUNIT_ASSERT_EQUAL(aTestObj9.queryUnmodified(), 9); + CPPUNIT_ASSERT_EQUAL(9, aTestObj9.queryUnmodified()); } // all three temporaries are dead now diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index e853fb135cc5..78868fec3de1 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -1353,9 +1353,9 @@ namespace osl_FileStatus Directory aDir(aTmpName3); nError1 = aDir.open(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = aDir.getNextItem(rItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); aDir.close(); } @@ -1370,7 +1370,7 @@ namespace osl_FileStatus { FileStatus rFileStatus(osl_FileStatus_Mask_All); nError1 = rItem.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); aUStr = rFileStatus.getFileName(); CPPUNIT_ASSERT_MESSAGE("test for ctors function: mask all and see the file name", @@ -1381,7 +1381,7 @@ namespace osl_FileStatus { FileStatus rFileStatus(0); nError1 = rItem.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); aUStr = rFileStatus.getFileName(); CPPUNIT_ASSERT_MESSAGE("test for ctors function: mask is empty", @@ -1416,16 +1416,16 @@ namespace osl_FileStatus pDir.reset(new Directory(aTmpName3)); osl::FileBase::RC nError1 = pDir->open(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = pDir->getNextItem(rItem_file, 1); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override { osl::FileBase::RC nError1 = pDir->close(); pDir.reset(); - CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), osl::FileBase::E_None, nError1); // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile(aTmpName4); @@ -1437,7 +1437,7 @@ namespace osl_FileStatus sal_uInt32 mask = 0; FileStatus rFileStatus(mask); osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); bool bOk = rFileStatus.isValid(mask); CPPUNIT_ASSERT_MESSAGE("test for isValid function: no fields specified", bOk); @@ -1481,7 +1481,7 @@ namespace osl_FileStatus DirectoryItem::get(aTmpName6, rItem_file); osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), osl::FileBase::E_None, nError1); check_FileStatus(rFileStatus); deleteTestFile(aTmpName6); @@ -1554,14 +1554,14 @@ namespace osl_FileStatus sal_uInt32 mask_file_all = osl_FileStatus_Mask_All; FileStatus rFileStatus_all(mask_file_all); osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus_all); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); check_FileStatus(rFileStatus_all); sal_uInt32 mask_file_val = osl_FileStatus_Mask_Validate; FileStatus rFileStatus_val(mask_file_val); nError1 = rItem_file.getFileStatus(rFileStatus_val); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); check_FileStatus(rFileStatus_val); } @@ -1600,13 +1600,13 @@ namespace osl_FileStatus std::unique_ptr<Directory> xDir(new Directory(aTmpName3)); nError1 = xDir->open(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("open aTmpName3 failed!", nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL_MESSAGE("open aTmpName3 failed!", osl::FileBase::E_None, nError1); // getNextItem can not assure which item retrieved nError1 = xDir->getNextItem(m_aItem_1, 1); - CPPUNIT_ASSERT_EQUAL_MESSAGE("get first item failed!", nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL_MESSAGE("get first item failed!", osl::FileBase::E_None, nError1); nError1 = xDir->getNextItem(m_aItem_2); - CPPUNIT_ASSERT_EQUAL_MESSAGE("get second item failed!", nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL_MESSAGE("get second item failed!", osl::FileBase::E_None, nError1); xDir->close(); // FIXME mindy: failed on my RH9,so removed temporaly // nError1 = DirectoryItem::get(aVolURL2, m_aVolumeItem); @@ -1625,7 +1625,7 @@ namespace osl_FileStatus { FileStatus rFileStatus(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName); nError1 = m_aItem_1.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL_MESSAGE("getFileStatus failed", nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL_MESSAGE("getFileStatus failed", osl::FileBase::E_None, nError1); check_FileType(rFileStatus); } @@ -1658,7 +1658,7 @@ namespace osl_FileStatus FileStatus rFileStatus(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName); nError1 = m_aItem_2.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); check_FileType(rFileStatus); } @@ -1670,12 +1670,12 @@ namespace osl_FileStatus { #if defined(__sun) // Special file is different in Windows nError1 = DirectoryItem::get(aTypeURL2, m_aSpecialItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check for File type FileStatus rFileStatus(osl_FileStatus_Mask_Type); nError1 = m_aSpecialItem.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); if (rFileStatus.isValid(osl_FileStatus_Mask_Type)) { @@ -1975,9 +1975,9 @@ namespace osl_FileStatus { File testfile(aTypeURL); nError = testfile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read); - CPPUNIT_ASSERT_EQUAL(nError, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); nError = testfile.setSize(TEST_FILE_SIZE); - CPPUNIT_ASSERT_EQUAL(nError, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); nError = DirectoryItem::get(aTypeURL, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); @@ -2256,10 +2256,10 @@ namespace osl_File nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); nError2 = testFile.close(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("close error", nError2, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL_MESSAGE("close error", osl::FileBase::E_None, nError2); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a regular file", - nError1, osl::FileBase::E_None); + osl::FileBase::E_None, nError1); } void open_002() @@ -2279,7 +2279,7 @@ namespace osl_File nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a non-exist file", - nError1, File::E_NOENT); + File::E_NOENT, nError1); } void open_004() @@ -2307,7 +2307,7 @@ namespace osl_File nError1 = testFile.open(osl_File_OpenFlag_Create); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: create an exist file", - nError1, File::E_EXIST); + File::E_EXIST, nError1); } void open_006() @@ -2320,13 +2320,13 @@ namespace osl_File nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); nError2 = testFile.write(buffer_write, 30, nCount_write); osl::FileBase::RC nError4 = testFile.setPos(osl_Pos_Absolut, 0); - CPPUNIT_ASSERT_EQUAL(nError4, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError4); nError3 = testFile.read(buffer_read, 10, nCount_read); osl::FileBase::RC nError5 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError5, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError5); osl::FileBase::RC nError6 = osl::File::remove(aCanURL1); - CPPUNIT_ASSERT_EQUAL(nError6, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError6); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: test for osl_File_OpenFlag_Read, osl_File_OpenFlag_Write and osl_File_OpenFlag_Create", osl::FileBase::E_None, nError1); @@ -2384,12 +2384,12 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError2 = testFile.close(); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for close function: close a regular file", - nError2, osl::FileBase::E_None); + osl::FileBase::E_None, nError2); } void close_002() @@ -2397,7 +2397,7 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError2 = testFile.close(); @@ -2442,11 +2442,11 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -2462,13 +2462,13 @@ namespace osl_File sal_Char buffer_read[2]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, 26); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.read(buffer_read, 1, nCount_read); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_Absolut, set the position to 26, test if the 26th char in file is correct", pBuffer_Char[26], buffer_read[0]); @@ -2480,15 +2480,15 @@ namespace osl_File sal_Char buffer_read[2]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, sizeof(pBuffer_Char) - 2); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Current, 0); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.read(buffer_read, 1, nCount_read); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_Current, set the position to end, test if the (end -1) char in file is correct", pBuffer_Char[sizeof(pBuffer_Char) - 2], buffer_read[0]); @@ -2500,17 +2500,17 @@ namespace osl_File sal_Char buffer_read[2]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // the file size is smaller than 100 nError1 = testFile.setPos(osl_Pos_End, -100); - CPPUNIT_ASSERT_EQUAL_MESSAGE("should return error", nError1, osl::FileBase::E_INVAL); + CPPUNIT_ASSERT_EQUAL_MESSAGE("should return error", osl::FileBase::E_INVAL, nError1); nError1 = testFile.setPos(osl_Pos_End, -53); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.read(buffer_read, 1, nCount_read); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setPos function: test for osl_Pos_End, set the position to end, test if the first char in file is correct", pBuffer_Char[0], buffer_read[0]); @@ -2550,11 +2550,11 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -2571,18 +2571,18 @@ namespace osl_File sal_uInt64 nFilePointer; nError1 = testFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_INVAL); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, nError1); nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, 26); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getPos function: set the position to 26, get position and check if it is right", static_cast<sal_uInt64>(26), nFilePointer); @@ -2620,11 +2620,11 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -2642,15 +2642,15 @@ namespace osl_File sal_Bool *pEOF = &bEOF; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_End, 0); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.isEndOfFile(pEOF); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_MESSAGE("test for isEndOfFile function: set the position to end, check if reach end", *pEOF); @@ -2664,28 +2664,28 @@ namespace osl_File sal_uInt64 nFilePointer = 0; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, 0); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); *pEOF = false; while (!(*pEOF)) { nError1 = testFile.isEndOfFile(pEOF); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Current, 1); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } nError1 = testFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for isEndOfFile function: use isEndOfFile to move pointer step by step", - nFilePointer, static_cast<sal_uInt64>(sizeof(pBuffer_Char) + 1)); + static_cast<sal_uInt64>(sizeof(pBuffer_Char) + 1), nFilePointer); } CPPUNIT_TEST_SUITE(isEndOfFile); CPPUNIT_TEST(isEndOfFile_001); @@ -2719,11 +2719,11 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -2740,20 +2740,20 @@ namespace osl_File sal_uInt64 nFilePointer; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // enlarge the file to size of 100; nError1 = testFile.setSize(100); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // get the file size; nError1 = testFile.setPos(osl_Pos_End, 0); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setSize function: enlarge the file ", static_cast<sal_uInt64>(100), nFilePointer); @@ -2765,20 +2765,20 @@ namespace osl_File sal_uInt64 nFilePointer; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // enlarge the file to size of 100; nError1 = testFile.setSize(10); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // get the file size; nError1 = testFile.setPos(osl_Pos_End, 0); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for setSize function: truncate the file ", static_cast<sal_uInt64>(10), nFilePointer); @@ -2817,11 +2817,11 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -2839,15 +2839,15 @@ namespace osl_File sal_Char buffer_read[10]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.read(buffer_read, 10, nCount_read); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for read function: read whole content in the file to a buffer", sal_uInt64(10), nFilePointer); @@ -2862,17 +2862,17 @@ namespace osl_File sal_Char buffer_read[26]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, 26); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.read(buffer_read, 26, nCount_read); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for read function: read from a special position in the file", sal_uInt64(52), nFilePointer); @@ -2925,22 +2925,22 @@ namespace osl_File sal_Char buffer_read[10]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // write chars into the file. nError1 = testFile.write(pBuffer_Char, 10, nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // get the current pointer; nError1 = testFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // reset pointer to the beginning; nError1 = testFile.setPos(osl_Pos_Absolut, 0); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.read(buffer_read, 10, nCount_read); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for write function: read whole content in the file to a buffer. Note, buffer size can not smaller than the read size", sal_uInt64(10), nFilePointer); @@ -2984,16 +2984,16 @@ namespace osl_File }; nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); for (int nCount = 0; nCount < 3; nCount++) { nError1 = testFile.write(ppStrSeq[nCount], strlen(ppStrSeq[nCount]), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -3008,9 +3008,9 @@ namespace osl_File File testFile(aTmpName6); nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.readLine(aSequence); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for readLine function: read the first line of the file.", osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for readLine function: read the first line of the file.", @@ -3024,14 +3024,14 @@ namespace osl_File sal_Bool *pEOF = &bEOF; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); for (int nCount = 0; nCount < 3; nCount++) { nError1 = testFile.readLine(aSequence); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } nError1 = testFile.isEndOfFile(pEOF); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_MESSAGE("test for readLine function: read three lines of the file and check the file pointer moving.", *pEOF); @@ -3069,11 +3069,11 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -3089,13 +3089,13 @@ namespace osl_File // copy $TEMP/tmpdir/tmpname to $TEMP/tmpname. nError1 = File::copy(aTmpName4, aTmpName6); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check nError1 = testFile.open(osl_File_OpenFlag_Create); deleteTestFile(aTmpName6); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy file to upper directory", - nError1, osl::FileBase::E_EXIST); + osl::FileBase::E_EXIST, nError1); } void copy_002() @@ -3116,7 +3116,7 @@ namespace osl_File deleteTestFile(aTmpName7); #endif CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy to an illegal place", - nError1, osl::FileBase::E_ACCES); + osl::FileBase::E_ACCES, nError1); } void copy_004() @@ -3125,7 +3125,7 @@ namespace osl_File nError1 = File::copy(aTmpName6, aTmpName4); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy a not exist file", - nError1, osl::FileBase::E_NOENT); + osl::FileBase::E_NOENT, nError1); } void copy_005() @@ -3134,7 +3134,7 @@ namespace osl_File nError1 = File::copy(aTmpName6, aSysPath1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy a file using system file path", - nError1, osl::FileBase::E_INVAL); + osl::FileBase::E_INVAL, nError1); } void copy_006() @@ -3152,11 +3152,11 @@ namespace osl_File File newFile(aTmpName4); newFile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read); nError1 = newFile.setPos(osl_Pos_End, 0); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); sal_uInt64 nFilePointer; nError1 = newFile.getPos(nFilePointer); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); newFile.close(); deleteTestFile(aTmpName6); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: the dest file exist", @@ -3199,11 +3199,11 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -3218,14 +3218,14 @@ namespace osl_File { // rename $TEMP/tmpdir/tmpname to $TEMP/canonical.name. nError1 = File::move(aTmpName4, aCanURL1); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check File testFile(aCanURL1); nError2 = testFile.open(osl_File_OpenFlag_Create); deleteTestFile(aCanURL1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: rename file to another directory", - nError2, osl::FileBase::E_EXIST); + osl::FileBase::E_EXIST, nError2); } void move_002() @@ -3247,7 +3247,7 @@ namespace osl_File #endif CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move to an illegal place", - nError1, osl::FileBase::E_ACCES); + osl::FileBase::E_ACCES, nError1); } void move_004() @@ -3256,7 +3256,7 @@ namespace osl_File nError1 = File::move(aTmpName6, aTmpName4); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a not exist file", - nError1, osl::FileBase::E_NOENT); + osl::FileBase::E_NOENT, nError1); } void move_005() @@ -3265,7 +3265,7 @@ namespace osl_File nError1 = File::move(aTmpName6, aSysPath1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a file using system file", - nError1, osl::FileBase::E_INVAL); + osl::FileBase::E_INVAL, nError1); } void move_006() @@ -3344,11 +3344,11 @@ namespace osl_File File testFile(aTmpName4); nError1 = testFile.open(osl_File_OpenFlag_Write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); } void tearDown() override @@ -3702,7 +3702,7 @@ namespace osl_DirectoryItem // get the DirectoryItem. nError1 = DirectoryItem::get(aTmpName6, rItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: initialize a new instance of DirectoryItem and get an item to check.", osl::FileBase::E_None, nError1); @@ -3742,7 +3742,7 @@ namespace osl_DirectoryItem DirectoryItem rItem; // constructor // get the DirectoryItem. nError1 = DirectoryItem::get(aTmpName6, rItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); DirectoryItem copyItem(rItem); // copy constructor FileStatus rFileStatus(osl_FileStatus_Mask_FileName); @@ -3758,7 +3758,7 @@ namespace osl_DirectoryItem DirectoryItem rItem; // constructor // get the DirectoryItem. nError1 = DirectoryItem::get(aTmpName6, rItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); DirectoryItem copyItem; copyItem = rItem; // assinment operator @@ -3812,7 +3812,7 @@ namespace osl_DirectoryItem DirectoryItem rItem; // constructor // get the DirectoryItem. nError1 = DirectoryItem::get(aTmpName6, rItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_MESSAGE("test for is function: use an uninitialized instance.", rItem.is()); @@ -3870,7 +3870,7 @@ namespace osl_DirectoryItem nError1 = DirectoryItem::get(aSysPath1, rItem); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for get function: use a system name instead of a URL.", - nError1, osl::FileBase::E_INVAL); + osl::FileBase::E_INVAL, nError1); } void get_003() @@ -3880,7 +3880,7 @@ namespace osl_DirectoryItem nError1 = DirectoryItem::get(aTmpName3, rItem); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for get function: use a non existed file URL.", - nError1, osl::FileBase::E_NOENT); + osl::FileBase::E_NOENT, nError1); } CPPUNIT_TEST_SUITE(get); @@ -3921,7 +3921,7 @@ namespace osl_DirectoryItem DirectoryItem rItem; // get the DirectoryItem. nError1 = DirectoryItem::get(aTmpName4, rItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check the file name FileStatus rFileStatus(osl_FileStatus_Mask_FileName); @@ -3952,7 +3952,7 @@ namespace osl_DirectoryItem DirectoryItem rItem; // constructor // get the DirectoryItem. nError1 = DirectoryItem::get(aTmpName3, rItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check the file name FileStatus rFileStatus(osl_FileStatus_Mask_FileName); @@ -4015,10 +4015,10 @@ namespace osl_Directory // open a directory nError1 = testDirectory.open(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // close a directory nError2 = testDirectory.close(); - CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: create an instance and check open and close", osl::FileBase::E_None, nError1); @@ -4032,10 +4032,10 @@ namespace osl_Directory // open a directory nError1 = testDirectory.open(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // close a directory nError2 = testDirectory.close(); - CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: relative URL, :-), it is also worked", osl::FileBase::E_None, nError1); @@ -4101,7 +4101,7 @@ namespace osl_Directory if (nError1 == osl::FileBase::E_None) { nError2 = testDirectory.close(); - CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); } CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a file that is not existed", @@ -4116,7 +4116,7 @@ namespace osl_Directory if (nError1 == osl::FileBase::E_None) { nError2 = testDirectory.close(); - CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); } CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: using system path", @@ -4131,7 +4131,7 @@ namespace osl_Directory if (nError1 == osl::FileBase::E_None) { nError2 = testDirectory.close(); - CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); } CPPUNIT_ASSERT_MESSAGE("test for open function: open a file instead of a directory", @@ -4298,31 +4298,31 @@ namespace osl_Directory // open a directory nError1 = testDirectory.open(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // get first Item nError1 = testDirectory.getNextItem(rItem, 1); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check the file name of first Item FileStatus rFileStatusFirst(osl_FileStatus_Mask_FileName); nError1 = rItem.getFileStatus(rFileStatusFirst); // get second Item // mindy: nError1 = testDirectory.getNextItem(rItem, 0); - // mindy: CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + // mindy: CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // reset enumeration nError2 = testDirectory.reset(); - CPPUNIT_ASSERT_EQUAL(nError2, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); // get reset Item, if reset does not work, getNextItem() should return the second Item (aTmpName1) nError1 = testDirectory.getNextItem(rItem); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check the file name again FileStatus rFileStatus(osl_FileStatus_Mask_FileName); nError1 = rItem.getFileStatus(rFileStatus); // close a directory nError1 = testDirectory.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); bool bOK1,bOK2,bOK3; bOK1 = compareFileName(rFileStatus.getFileName(), aTmpName2); @@ -4415,7 +4415,7 @@ namespace osl_Directory // open a directory nError1 = testDirectory.open(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check the file name bool bOk1 = false; @@ -4427,9 +4427,9 @@ namespace osl_Directory { // get three Items nError1 = testDirectory.getNextItem(rItem, 2); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = rItem.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // a special order is not guaranteed. So any file may occur on any time. // But every file name should occur only once. @@ -4451,7 +4451,7 @@ namespace osl_Directory // close a directory nError1 = testDirectory.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_MESSAGE("test for getNextItem function: retrieve three items and check their names.", bOk1); @@ -4476,7 +4476,7 @@ namespace osl_Directory // open a directory nError1 = testDirectory.open(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); for (int nCount = 0; nCount < 4; nCount++) { @@ -4485,7 +4485,7 @@ namespace osl_Directory // close a directory nError1 = testDirectory.close(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getNextItem function: retrieve 4 times in a directory which contain only 3 files.", osl::FileBase::E_NOENT, nError2); @@ -4513,7 +4513,7 @@ namespace osl_Directory // open a directory nError1 = testDirectory.open(); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); OUString aFileName ("link.file"); while (true) { @@ -4827,7 +4827,7 @@ namespace osl_Directory { // create directory in $TEMP/tmpdir nError1 = Directory::create(aTmpName3); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // remove it nError1 = Directory::remove(aTmpName3); // check for existence @@ -4844,7 +4844,7 @@ namespace osl_Directory { // create directory in $TEMP/tmpdir nError1 = Directory::create(aTmpName3); - CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // try to remove it by system path nError1 = Directory::remove(aSysPath3); // check for existence diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 92796fa7d4df..ea29fdd7c742 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -504,7 +504,7 @@ namespace osl_Pipe int nRet = aPipe.send( m_pTestString1.getStr(), 3 ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "#test comment#: use after close.", - nRet, OSL_PIPE_FAIL ); + OSL_PIPE_FAIL, nRet ); } CPPUNIT_TEST_SUITE( close ); diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index 3e718940b097..36e404f122e9 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -65,28 +65,28 @@ public: '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end); - CPPUNIT_ASSERT_EQUAL(rtl::math::isNan(res), true); + CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res)); res = rtl::math::stringToDouble( rtl::OUString("NaN1.23"), '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end); - CPPUNIT_ASSERT_EQUAL(rtl::math::isNan(res), true); + CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res)); res = rtl::math::stringToDouble( rtl::OUString("INF"), '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end); - CPPUNIT_ASSERT_EQUAL(rtl::math::isInf(res), true); + CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res)); res = rtl::math::stringToDouble( rtl::OUString("INF1.23"), '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end); - CPPUNIT_ASSERT_EQUAL(rtl::math::isInf(res), true); + CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res)); res = rtl::math::stringToDouble( rtl::OUString(".5"), diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index f671c3d2d133..4f37f203781d 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -128,7 +128,7 @@ public: CPPUNIT_ASSERT_EQUAL_MESSAGE ( "osl_getProcessInfo returned with failure", - osl_error, osl_Process_E_None + osl_Process_E_None, osl_error ); printf("the exit code is %" SAL_PRIuUINT32 ".\n", pInfo->Code ); diff --git a/sax/qa/cppunit/attributes.cxx b/sax/qa/cppunit/attributes.cxx index 244da02eb535..c0ffdd7178ab 100644 --- a/sax/qa/cppunit/attributes.cxx +++ b/sax/qa/cppunit/attributes.cxx @@ -46,10 +46,10 @@ void AttributesTest::test() CPPUNIT_ASSERT( xAttributeList->hasAttribute(1) ); CPPUNIT_ASSERT( !xAttributeList->hasAttribute(3) ); - CPPUNIT_ASSERT_EQUAL( xAttributeList->getOptionalValue(2), OUString("2") ); - CPPUNIT_ASSERT_EQUAL( xAttributeList->getOptionalValue(3), OUString() ); + CPPUNIT_ASSERT_EQUAL( OUString("2"), xAttributeList->getOptionalValue(2) ); + CPPUNIT_ASSERT_EQUAL( OUString(), xAttributeList->getOptionalValue(3) ); - CPPUNIT_ASSERT_EQUAL( xAttributeList->getValue(1), OUString("1") ); + CPPUNIT_ASSERT_EQUAL( OUString("1"), xAttributeList->getValue(1) ); CPPUNIT_ASSERT_THROW( xAttributeList->getValue(3), xml::sax::SAXException ); xAttributeList->addUnknown("a", "a"); diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 2a0afb4323aa..616d11f7d845 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -243,7 +243,7 @@ void testContentImpl(ScDocument& rDoc, sal_Int32 nFormat ) //same code for ods, ScAddress aAddress(7, 2, 0); ScPostIt* pNote = rDoc.GetNote(aAddress); CPPUNIT_ASSERT_MESSAGE("note not imported", pNote); - CPPUNIT_ASSERT_EQUAL_MESSAGE("note text not imported correctly", pNote->GetText(), OUString("Test")); + CPPUNIT_ASSERT_EQUAL_MESSAGE("note text not imported correctly", OUString("Test"), pNote->GetText() ); } //add additional checks here diff --git a/sc/qa/unit/helper/shared_test_impl.hxx b/sc/qa/unit/helper/shared_test_impl.hxx index 344e932b0695..114f2571f610 100644 --- a/sc/qa/unit/helper/shared_test_impl.hxx +++ b/sc/qa/unit/helper/shared_test_impl.hxx @@ -64,7 +64,7 @@ void testDataBar_Impl(const ScDocument& rDoc) CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size()); const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0); - CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), ScFormatEntry::Type::Databar); + CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Databar, pFormatEntry->GetType()); const ScDataBarFormat* pDataBar = static_cast<const ScDataBarFormat*>(pFormatEntry); CPPUNIT_ASSERT(pDataBar); const ScDataBarFormatData* pDataBarData = pDataBar->GetDataBarData(); @@ -101,7 +101,7 @@ void testColorScale2Entry_Impl(const ScDocument& rDoc) CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size()); const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0); - CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), ScFormatEntry::Type::Colorscale); + CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Colorscale, pFormatEntry->GetType()); const ScColorScaleFormat* pColFormat = static_cast<const ScColorScaleFormat*>(pFormatEntry); CPPUNIT_ASSERT_EQUAL(size_t(2), pColFormat->size()); @@ -140,7 +140,7 @@ void testColorScale3Entry_Impl(const ScDocument& rDoc) CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size()); const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0); - CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), ScFormatEntry::Type::Colorscale); + CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Colorscale, pFormatEntry->GetType()); const ScColorScaleFormat* pColFormat = static_cast<const ScColorScaleFormat*>(pFormatEntry); CPPUNIT_ASSERT_EQUAL(size_t(3), pColFormat->size()); diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx index 0858f7a358af..01e815aed24b 100644 --- a/sc/qa/unit/rangelst_test.cxx +++ b/sc/qa/unit/rangelst_test.cxx @@ -115,7 +115,7 @@ void Test::testDeleteArea_4Ranges() ScRangeList aList(ScRange(0,0,0,5,5,0)); aList.DeleteArea(2,2,0,3,3,0); - CPPUNIT_ASSERT_EQUAL(aList.size(), static_cast<size_t>(4)); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), aList.size()); for(SCCOL nCol = 0; nCol <= 5; ++nCol) { for(SCROW nRow = 0; nRow <= 5; ++nRow) @@ -236,8 +236,8 @@ void Test::testDeleteArea_2Ranges() aList.DeleteArea(4,4,0,6,7,0); aList2.DeleteArea(4,4,0,6,7,0); - CPPUNIT_ASSERT_EQUAL(aList.size(), static_cast<size_t>(2)); - CPPUNIT_ASSERT_EQUAL(aList2.size(), static_cast<size_t>(2)); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), aList.size()); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), aList2.size()); for(SCCOL nCol = 0; nCol <= 5; ++nCol) { diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 2e876434ce49..6aa41875f61c 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -698,13 +698,13 @@ void ScFiltersTest::testCachedFormulaResultsODS() aIsErrorFormula.append(")"); OUString aFormula = aIsErrorFormula.makeStringAndClear(); rDoc.SetString(nCol, nRow + 2, 2, aFormula); - CPPUNIT_ASSERT_EQUAL_MESSAGE(OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8).getStr(), rDoc.GetString(nCol, nRow +2, 2), OUString("TRUE")); + CPPUNIT_ASSERT_EQUAL_MESSAGE(OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8).getStr(), OUString("TRUE"), rDoc.GetString(nCol, nRow +2, 2)); OUStringBuffer aIsTextFormula("=ISTEXT("); aIsTextFormula.append(static_cast<char>('A'+nCol)).append(OUString::number(nRow)); aIsTextFormula.append(")"); rDoc.SetString(nCol, nRow + 4, 2, aIsTextFormula.makeStringAndClear()); - CPPUNIT_ASSERT_EQUAL_MESSAGE("", rDoc.GetString(nCol, nRow +4, 2), OUString("FALSE")); + CPPUNIT_ASSERT_EQUAL(OUString("FALSE"), rDoc.GetString(nCol, nRow +4, 2)); } } @@ -2178,7 +2178,7 @@ void ScFiltersTest::testCondFormatThemeColorXLSX() ScConditionalFormat* pFormat = rDoc.GetCondFormat(0, 0, 0); const ScFormatEntry* pEntry = pFormat->GetEntry(0); CPPUNIT_ASSERT(pEntry); - CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Databar); + CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Databar, pEntry->GetType()); const ScDataBarFormat* pDataBar = static_cast<const ScDataBarFormat*>(pEntry); const ScDataBarFormatData* pDataBarFormatData = pDataBar->GetDataBarData(); @@ -2192,7 +2192,7 @@ void ScFiltersTest::testCondFormatThemeColorXLSX() CPPUNIT_ASSERT_EQUAL(size_t(1), pFormat->size()); pEntry = pFormat->GetEntry(0); CPPUNIT_ASSERT(pEntry); - CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Colorscale); + CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Colorscale, pEntry->GetType()); const ScColorScaleFormat* pColorScale = static_cast<const ScColorScaleFormat*>(pEntry); CPPUNIT_ASSERT_EQUAL(size_t(2), pColorScale->size()); const ScColorScaleEntry* pColorScaleEntry = pColorScale->GetEntry(0); @@ -2217,7 +2217,7 @@ void ScFiltersTest::testCondFormatThemeColor2XLSX() CPPUNIT_ASSERT(pFormat); const ScFormatEntry* pEntry = pFormat->GetEntry(0); CPPUNIT_ASSERT(pEntry); - CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Databar); + CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Databar, pEntry->GetType()); const ScDataBarFormat* pDataBar = static_cast<const ScDataBarFormat*>(pEntry); const ScDataBarFormatData* pDataBarFormatData = pDataBar->GetDataBarData(); @@ -2236,7 +2236,7 @@ void checkDatabarPositiveColor(const ScConditionalFormat* pFormat, const Color& CPPUNIT_ASSERT(pFormat); const ScFormatEntry* pEntry = pFormat->GetEntry(0); CPPUNIT_ASSERT(pEntry); - CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Databar); + CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Databar, pEntry->GetType()); const ScDataBarFormat* pDataBar = static_cast<const ScDataBarFormat*>(pEntry); const ScDataBarFormatData* pDataBarFormatData = pDataBar->GetDataBarData(); @@ -2256,7 +2256,7 @@ void ScFiltersTest::testCondFormatThemeColor3XLSX() CPPUNIT_ASSERT(pFormat); const ScFormatEntry* pEntry = pFormat->GetEntry(0); CPPUNIT_ASSERT(pEntry); - CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Colorscale); + CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Colorscale, pEntry->GetType()); const ScColorScaleFormat* pColorScale = static_cast<const ScColorScaleFormat*>(pEntry); CPPUNIT_ASSERT_EQUAL(size_t(2), pColorScale->size()); @@ -2425,10 +2425,10 @@ void ScFiltersTest::testOrcusODSStyleInterface() CPPUNIT_ASSERT_EQUAL(Color(255, 204, 18), pBoxItem->GetRight()->GetColor()); CPPUNIT_ASSERT_EQUAL(Color(255, 204, 18), pBoxItem->GetTop()->GetColor()); CPPUNIT_ASSERT_EQUAL(Color(255, 204, 18), pBoxItem->GetBottom()->GetColor()); - CPPUNIT_ASSERT_EQUAL(pBoxItem->GetLeft()->GetBorderLineStyle(), SvxBorderLineStyle::DOTTED); - CPPUNIT_ASSERT_EQUAL(pBoxItem->GetRight()->GetBorderLineStyle(), SvxBorderLineStyle::DOTTED); - CPPUNIT_ASSERT_EQUAL(pBoxItem->GetTop()->GetBorderLineStyle(), SvxBorderLineStyle::DOTTED); - CPPUNIT_ASSERT_EQUAL(pBoxItem->GetBottom()->GetBorderLineStyle(), SvxBorderLineStyle::DOTTED); + CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::DOTTED, pBoxItem->GetLeft()->GetBorderLineStyle()); + CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::DOTTED, pBoxItem->GetRight()->GetBorderLineStyle()); + CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::DOTTED, pBoxItem->GetTop()->GetBorderLineStyle()); + CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::DOTTED, pBoxItem->GetBottom()->GetBorderLineStyle()); ASSERT_DOUBLES_EQUAL_MESSAGE("Error with left width", 1, pBoxItem->GetLeft()->GetWidth()); ASSERT_DOUBLES_EQUAL_MESSAGE("Error with right width", 1, pBoxItem->GetRight()->GetWidth()); ASSERT_DOUBLES_EQUAL_MESSAGE("Error with top width", 1, pBoxItem->GetTop()->GetWidth()); @@ -2452,8 +2452,8 @@ void ScFiltersTest::testOrcusODSStyleInterface() pBoxItem = static_cast<const SvxBoxItem*>(pItem); CPPUNIT_ASSERT_EQUAL(Color(0, 0, 0), pBoxItem->GetLeft()->GetColor()); CPPUNIT_ASSERT_EQUAL(Color(255, 0, 0), pBoxItem->GetRight()->GetColor()); - CPPUNIT_ASSERT_EQUAL(pBoxItem->GetLeft()->GetBorderLineStyle(), SvxBorderLineStyle::SOLID); - CPPUNIT_ASSERT_EQUAL(pBoxItem->GetRight()->GetBorderLineStyle(), SvxBorderLineStyle::DOTTED); + CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::SOLID, pBoxItem->GetLeft()->GetBorderLineStyle()); + CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::DOTTED, pBoxItem->GetRight()->GetBorderLineStyle()); ASSERT_DOUBLES_EQUAL_MESSAGE("Error with left width", 0, pBoxItem->GetLeft()->GetWidth()); ASSERT_DOUBLES_EQUAL_MESSAGE("Error with right width", 14, pBoxItem->GetRight()->GetWidth()); @@ -2462,7 +2462,7 @@ void ScFiltersTest::testOrcusODSStyleInterface() const SvxLineItem* pTLBR= static_cast<const SvxLineItem*>(pItem); CPPUNIT_ASSERT_EQUAL(Color(18, 0, 0), pTLBR->GetLine()->GetColor()); - CPPUNIT_ASSERT_EQUAL(pTLBR->GetLine()->GetBorderLineStyle(), SvxBorderLineStyle::DASH_DOT); + CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::DASH_DOT, pTLBR->GetLine()->GetBorderLineStyle()); ASSERT_DOUBLES_EQUAL_MESSAGE("Error with diagonal tl-br width", 14, pTLBR->GetLine()->GetWidth()); CPPUNIT_ASSERT_MESSAGE("Style Name2 : Doesn't have Attribute diagonal(bl-tr) border, but it should have.", @@ -2470,7 +2470,7 @@ void ScFiltersTest::testOrcusODSStyleInterface() const SvxLineItem* pBLTR= static_cast<const SvxLineItem*>(pItem); CPPUNIT_ASSERT_EQUAL(Color(255, 204, 238), pBLTR->GetLine()->GetColor()); - CPPUNIT_ASSERT_EQUAL(pBLTR->GetLine()->GetBorderLineStyle(), SvxBorderLineStyle::DASHED); + CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::DASHED, pBLTR->GetLine()->GetBorderLineStyle()); ASSERT_DOUBLES_EQUAL_MESSAGE("Error with diagonal tl-br width", 34, pBLTR->GetLine()->GetWidth()); CPPUNIT_ASSERT_MESSAGE("Style Name2 : Has Attribute background, but it shouldn't.", diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 84c8ed3b7ed0..725561df1e16 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -388,13 +388,13 @@ void ScTiledRenderingTest::testDocumentSize() pViewShell->SetCursor(100, 0); // 2 seconds osl::Condition::Result aResult = m_aDocSizeCondition.wait(std::chrono::seconds(2)); - CPPUNIT_ASSERT_EQUAL(aResult, osl::Condition::result_ok); + CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, aResult); // Set cursor row pViewShell->SetCursor(0, 100); // 2 seconds aResult = m_aDocSizeCondition.wait(std::chrono::seconds(2)); - CPPUNIT_ASSERT_EQUAL(aResult, osl::Condition::result_ok); + CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, aResult); comphelper::LibreOfficeKit::setActive(false); } diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 3eff3f0dac9a..088fef9fa036 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -4648,7 +4648,7 @@ void Test::testJumpToPrecedentsDependents() ScRangeList aRange(aC2); rDocFunc.DetectiveCollectAllPreds(aRange, aRefTokens); CPPUNIT_ASSERT_EQUAL_MESSAGE("there should only be one reference token.", - aRefTokens.size(), static_cast<size_t>(1)); + static_cast<size_t>(1), aRefTokens.size()); CPPUNIT_ASSERT_MESSAGE("A1 should be a precedent of C1.", hasRange(aRefTokens, ScRange(0, 0, 0), aC2)); } @@ -4718,9 +4718,9 @@ void Test::testAutoFill() m_pDoc->SetString( 0, 100, 0, "January" ); m_pDoc->Fill( 0, 100, 0, 100, nullptr, aMarkData, 2, FILL_TO_BOTTOM, FILL_AUTO ); OUString aTestValue = m_pDoc->GetString( 0, 101, 0 ); - CPPUNIT_ASSERT_EQUAL( aTestValue, OUString("February") ); + CPPUNIT_ASSERT_EQUAL( OUString("February"), aTestValue ); aTestValue = m_pDoc->GetString( 0, 102, 0 ); - CPPUNIT_ASSERT_EQUAL( aTestValue, OUString("March") ); + CPPUNIT_ASSERT_EQUAL( OUString("March"), aTestValue ); // test that two same user data list entries will not result in incremental fill m_pDoc->SetString( 0, 101, 0, "January" ); @@ -4728,7 +4728,7 @@ void Test::testAutoFill() for ( SCROW i = 102; i <= 103; ++i ) { aTestValue = m_pDoc->GetString( 0, i, 0 ); - CPPUNIT_ASSERT_EQUAL( aTestValue, OUString("January") ); + CPPUNIT_ASSERT_EQUAL( OUString("January"), aTestValue ); } // Clear column A for a new test. @@ -4837,15 +4837,15 @@ void Test::testCopyPasteFormulas() ASSERT_DOUBLES_EQUAL(m_pDoc->GetValue(10,11,0), 1.0); OUString aFormula; m_pDoc->GetFormula(10,10,0, aFormula); - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=COLUMN($A$1)")); + CPPUNIT_ASSERT_EQUAL(OUString("=COLUMN($A$1)"), aFormula); m_pDoc->GetFormula(10,11,0, aFormula); - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=$A$1+L12")); + CPPUNIT_ASSERT_EQUAL(OUString("=$A$1+L12"), aFormula); m_pDoc->GetFormula(10,12,0, aFormula); - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=$Sheet2.K11")); + CPPUNIT_ASSERT_EQUAL(OUString("=$Sheet2.K11"), aFormula); m_pDoc->GetFormula(10,13,0, aFormula); - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=$Sheet2.$A$1")); + CPPUNIT_ASSERT_EQUAL(OUString("=$Sheet2.$A$1"), aFormula); m_pDoc->GetFormula(10,14,0, aFormula); - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=$Sheet2.K$1")); + CPPUNIT_ASSERT_EQUAL(OUString("=$Sheet2.K$1"), aFormula); } void Test::testCopyPasteFormulasExternalDoc() @@ -4894,19 +4894,19 @@ void Test::testCopyPasteFormulasExternalDoc() OUString aFormula; rExtDoc.GetFormula(1,1,1, aFormula); //adjust absolute refs pointing to the copy area - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=COLUMN($B$2)")); + CPPUNIT_ASSERT_EQUAL(OUString("=COLUMN($B$2)"), aFormula); rExtDoc.GetFormula(1,2,1, aFormula); //adjust absolute refs and keep relative refs - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=$B$2+C3")); + CPPUNIT_ASSERT_EQUAL(OUString("=$B$2+C3"), aFormula); rExtDoc.GetFormula(1,3,1, aFormula); // make absolute sheet refs external refs - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("='file:///source.fake'#$Sheet2.B2")); + CPPUNIT_ASSERT_EQUAL(OUString("='file:///source.fake'#$Sheet2.B2"), aFormula); rExtDoc.GetFormula(1,4,1, aFormula); - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("='file:///source.fake'#$Sheet2.$A$1")); + CPPUNIT_ASSERT_EQUAL(OUString("='file:///source.fake'#$Sheet2.$A$1"), aFormula); rExtDoc.GetFormula(1,5,1, aFormula); - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("='file:///source.fake'#$Sheet2.B$1")); + CPPUNIT_ASSERT_EQUAL(OUString("='file:///source.fake'#$Sheet2.B$1"), aFormula); rExtDoc.GetFormula(1,6,1, aFormula); - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=$ExtSheet2.$B$2")); + CPPUNIT_ASSERT_EQUAL(OUString("=$ExtSheet2.$B$2"), aFormula); xExtDocSh->DoClose(); } @@ -4949,7 +4949,7 @@ void Test::testCopyPasteReferencesExternalDoc() OUString aFormula; rExtDoc.GetFormula(0,3,0, aFormula); //adjust absolute refs pointing to the copy area - CPPUNIT_ASSERT_EQUAL(aFormula, OUString("=SUM('file:///source.fake'#$Sheet1.A#REF!:A3)")); + CPPUNIT_ASSERT_EQUAL(OUString("=SUM('file:///source.fake'#$Sheet1.A#REF!:A3)"), aFormula); xExtDocSh->DoClose(); } @@ -6748,7 +6748,7 @@ void Test::checkPrecisionAsShown( OUString& rCode, double fValue, double fExpect sal_Int32 nCheckPos = 0; SvNumFormatType nType; pFormatter->PutEntry( rCode, nCheckPos, nType, nFormat ); - CPPUNIT_ASSERT_EQUAL( nCheckPos, sal_Int32(0) ); + CPPUNIT_ASSERT_EQUAL( sal_Int32(0), nCheckPos ); } double fRoundValue = m_pDoc->RoundValueAsShown( fValue, nFormat ); rtl::OString aMessage = "Format \""; diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx index b3d755f3a7c2..b2febe4ec136 100644 --- a/sc/qa/unit/ucalc_condformat.cxx +++ b/sc/qa/unit/ucalc_condformat.cxx @@ -112,7 +112,7 @@ void Test::testCondFormatINSDEL() CPPUNIT_ASSERT_EQUAL(static_cast<const ScRangeList&>(ScRange(2,0,0,2,3,0)), rRange); OUString aExpr = pEntry->GetExpression(ScAddress(2,0,0), 0); - CPPUNIT_ASSERT_EQUAL(aExpr, OUString("D2")); + CPPUNIT_ASSERT_EQUAL(OUString("D2"), aExpr); m_pDoc->DeleteTab(0); } diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 86aa3707bf25..db58aaf77e34 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -296,7 +296,7 @@ void SdOOXMLExportTest1::testN828390_5() const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject(); const SvxNumBulletItem *pNumFmt = aEdit.GetPool()->GetItem2(EE_PARA_NUMBULLET, 5); CPPUNIT_ASSERT( pNumFmt ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's relative size is wrong!", pNumFmt->GetNumRule()->GetLevel(1).GetBulletRelSize(), sal_uInt16(75) ); // != 25 + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's relative size is wrong!", sal_uInt16(75), pNumFmt->GetNumRule()->GetLevel(1).GetBulletRelSize() ); // != 25 } xDocShRef->DoClose(); @@ -538,7 +538,7 @@ void SdOOXMLExportTest1::testBulletStartNumber() const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject(); const SvxNumBulletItem *pNumFmt = aEdit.GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET); CPPUNIT_ASSERT(pNumFmt); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's start number is wrong!", sal_Int16(pNumFmt->GetNumRule()->GetLevel(0).GetStart()), sal_Int16(3) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's start number is wrong!", sal_Int16(3), sal_Int16(pNumFmt->GetNumRule()->GetLevel(0).GetStart()) ); xDocShRef->DoClose(); } diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index c77d77480178..7e37d3c6ad0b 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -2243,7 +2243,7 @@ void SdImportTest::testTdf108925() const SvxNumBulletItem *pNumFmt = aEdit.GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET); CPPUNIT_ASSERT(pNumFmt); - CPPUNIT_ASSERT_EQUAL(pNumFmt->GetNumRule()->GetLevel(0).GetBulletRelSize(), sal_uInt16(25)); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(25), pNumFmt->GetNumRule()->GetLevel(0).GetBulletRelSize()); xDocShRef->DoClose(); } @@ -2540,7 +2540,7 @@ void SdImportTest::testTdf116899() anim::create_deep_vector(xRootNode, aAnimVector); uno::Reference< animations::XAnimate > xNode( aAnimVector[8], uno::UNO_QUERY_THROW ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of key times in the animation node isn't 2.", xNode->getKeyTimes().getLength(), static_cast<sal_Int32>(2) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of key times in the animation node isn't 2.", static_cast<sal_Int32>(2), xNode->getKeyTimes().getLength() ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "First key time in the animation node isn't 0, key times aren't normalized.", 0., xNode->getKeyTimes()[0] ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Second key time in the animation node isn't 1, key times aren't normalized.", 1., xNode->getKeyTimes()[1] ); } @@ -2553,9 +2553,9 @@ void SdImportTest::testTdf77747() CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr); const SvxNumBulletItem *pNumFmt = pTxtObj->GetOutlinerParaObject()->GetTextObject().GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET); CPPUNIT_ASSERT(pNumFmt); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's suffix is wrong!", pNumFmt->GetNumRule()->GetLevel(0).GetSuffix(), OUString("-") ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's numbering type is wrong!", pNumFmt->GetNumRule()->GetLevel(0).GetNumberingType(), - SVX_NUM_NUMBER_HEBREW); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's suffix is wrong!", OUString("-"), pNumFmt->GetNumRule()->GetLevel(0).GetSuffix() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's numbering type is wrong!", SVX_NUM_NUMBER_HEBREW, + pNumFmt->GetNumRule()->GetLevel(0).GetNumberingType()); xDocShRef->DoClose(); } diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 7f3ad5a68a39..31d0b52ff2d3 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -743,7 +743,7 @@ void SdTiledRenderingTest::testInsertDeletePage() comphelper::dispatchCommand(".uno:InsertPage", aArgs); osl::Condition::Result aResult = m_aDocumentSizeCondition.wait(std::chrono::seconds(2)); - CPPUNIT_ASSERT_EQUAL(aResult, osl::Condition::result_ok); + CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, aResult); // Verify inserted slides std::vector<OUString> aPageList(getCurrentParts(pXImpressDocument)); @@ -760,7 +760,7 @@ void SdTiledRenderingTest::testInsertDeletePage() comphelper::dispatchCommand(".uno:DeletePage", aArgs); aResult = m_aDocumentSizeCondition.wait(std::chrono::seconds(2)); - CPPUNIT_ASSERT_EQUAL(aResult, osl::Condition::result_ok); + CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, aResult); // Verify deleted slides aPageList = getCurrentParts(pXImpressDocument); @@ -776,7 +776,7 @@ void SdTiledRenderingTest::testInsertDeletePage() comphelper::dispatchCommand(".uno:Undo", aArgs); aResult = m_aDocumentSizeCondition.wait(std::chrono::seconds(2)); - CPPUNIT_ASSERT_EQUAL(aResult, osl::Condition::result_ok); + CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, aResult); // Verify inserted slides aPageList = getCurrentParts(pXImpressDocument); @@ -792,7 +792,7 @@ void SdTiledRenderingTest::testInsertDeletePage() comphelper::dispatchCommand(".uno:Redo", aArgs); aResult = m_aDocumentSizeCondition.wait(std::chrono::seconds(2)); - CPPUNIT_ASSERT_EQUAL(aResult, osl::Condition::result_ok); + CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, aResult); // Verify deleted slides aPageList = getCurrentParts(pXImpressDocument); @@ -1561,7 +1561,7 @@ void SdTiledRenderingTest::testTdf104405() OString aPrefix = "/SdDrawDocument/SdrModel/SdPage/SdrObjList/SdrTableObj/SdrTableObjImpl" "/TableModel/Cell[1]/DefaultProperties/SfxItemSet/SdrTextVertAdjustItem"; // the following name has a compiler-dependent part - CPPUNIT_ASSERT_EQUAL(getXPath(pXmlDoc, aPrefix, "value"), OUString("2")); + CPPUNIT_ASSERT_EQUAL(OUString("2"), getXPath(pXmlDoc, aPrefix, "value")); xmlFreeDoc(pXmlDoc); comphelper::LibreOfficeKit::setActive(false); diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx index b7c17a0e1cf3..88764a63f842 100644 --- a/sfx2/qa/cppunit/test_misc.cxx +++ b/sfx2/qa/cppunit/test_misc.cxx @@ -172,7 +172,7 @@ void MiscTest::testHardLinks() struct stat buf; int nRet = stat(aOld.getStr(), &buf); - CPPUNIT_ASSERT_EQUAL(nRet, 0); + CPPUNIT_ASSERT_EQUAL(0, nRet); // This failed: hard link count was 1, the hard link broke on store. CPPUNIT_ASSERT(buf.st_nlink > 1); diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 679340afd67a..ff344ff65834 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -1521,58 +1521,58 @@ void Test::testNfEnglishKeywordsIntegrity() CPPUNIT_ASSERT_EQUAL( sKeywords[i], rEnglishKeywords[i] ); } // Check the order of sEnglishKeyword - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_E], OUString("E") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_AMPM], OUString("AM/PM") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_AP], OUString("A/P") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MI], OUString("M") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MMI], OUString("MM") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_M], OUString("M") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MM], OUString("MM") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MMM], OUString("MMM") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MMMM], OUString("MMMM") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_H], OUString("H") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_HH], OUString("HH") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_S], OUString("S") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_SS], OUString("SS") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_Q], OUString("Q") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_QQ], OUString("QQ") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_D], OUString("D") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_DD], OUString("DD") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_DDD], OUString("DDD") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_DDDD], OUString("DDDD") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_YY], OUString("YY") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_YYYY], OUString("YYYY") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_NN], OUString("NN") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_NNNN], OUString("NNNN") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_CCC], OUString("CCC") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GENERAL], OUString("GENERAL") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_NNN], OUString("NNN") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_WW], OUString("WW") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MMMMM], OUString("MMMMM") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_TRUE], OUString("TRUE") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_FALSE], OUString("FALSE") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_BOOLEAN], OUString("BOOLEAN") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_COLOR], OUString("COLOR") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_BLACK], OUString("BLACK") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_BLUE], OUString("BLUE") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GREEN], OUString("GREEN") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_CYAN], OUString("CYAN") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_RED], OUString("RED") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MAGENTA], OUString("MAGENTA") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_BROWN], OUString("BROWN") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GREY], OUString("GREY") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_YELLOW], OUString("YELLOW") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_WHITE], OUString("WHITE") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_AAA], OUString("AAA") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_AAAA], OUString("AAAA") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_EC], OUString("E") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_EEC], OUString("EE") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_G], OUString("G") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GG], OUString("GG") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GGG], OUString("GGG") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_R], OUString("R") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_RR], OUString("RR") ); - CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_THAI_T], OUString("t") ); + CPPUNIT_ASSERT_EQUAL( OUString("E"), rEnglishKeywords[NF_KEY_E] ); + CPPUNIT_ASSERT_EQUAL( OUString("AM/PM"), rEnglishKeywords[NF_KEY_AMPM] ); + CPPUNIT_ASSERT_EQUAL( OUString("A/P"), rEnglishKeywords[NF_KEY_AP] ); + CPPUNIT_ASSERT_EQUAL( OUString("M"), rEnglishKeywords[NF_KEY_MI] ); + CPPUNIT_ASSERT_EQUAL( OUString("MM"), rEnglishKeywords[NF_KEY_MMI] ); + CPPUNIT_ASSERT_EQUAL( OUString("M"), rEnglishKeywords[NF_KEY_M] ); + CPPUNIT_ASSERT_EQUAL( OUString("MM"), rEnglishKeywords[NF_KEY_MM] ); + CPPUNIT_ASSERT_EQUAL( OUString("MMM"), rEnglishKeywords[NF_KEY_MMM] ); + CPPUNIT_ASSERT_EQUAL( OUString("MMMM"), rEnglishKeywords[NF_KEY_MMMM] ); + CPPUNIT_ASSERT_EQUAL( OUString("H"), rEnglishKeywords[NF_KEY_H] ); + CPPUNIT_ASSERT_EQUAL( OUString("HH"), rEnglishKeywords[NF_KEY_HH] ); + CPPUNIT_ASSERT_EQUAL( OUString("S"), rEnglishKeywords[NF_KEY_S] ); + CPPUNIT_ASSERT_EQUAL( OUString("SS"), rEnglishKeywords[NF_KEY_SS] ); + CPPUNIT_ASSERT_EQUAL( OUString("Q"), rEnglishKeywords[NF_KEY_Q] ); + CPPUNIT_ASSERT_EQUAL( OUString("QQ"), rEnglishKeywords[NF_KEY_QQ] ); + CPPUNIT_ASSERT_EQUAL( OUString("D"), rEnglishKeywords[NF_KEY_D] ); + CPPUNIT_ASSERT_EQUAL( OUString("DD"), rEnglishKeywords[NF_KEY_DD] ); + CPPUNIT_ASSERT_EQUAL( OUString("DDD"), rEnglishKeywords[NF_KEY_DDD] ); + CPPUNIT_ASSERT_EQUAL( OUString("DDDD"), rEnglishKeywords[NF_KEY_DDDD] ); + CPPUNIT_ASSERT_EQUAL( OUString("YY"), rEnglishKeywords[NF_KEY_YY] ); + CPPUNIT_ASSERT_EQUAL( OUString("YYYY"), rEnglishKeywords[NF_KEY_YYYY] ); + CPPUNIT_ASSERT_EQUAL( OUString("NN"), rEnglishKeywords[NF_KEY_NN] ); + CPPUNIT_ASSERT_EQUAL( OUString("NNNN"), rEnglishKeywords[NF_KEY_NNNN] ); + CPPUNIT_ASSERT_EQUAL( OUString("CCC"), rEnglishKeywords[NF_KEY_CCC] ); + CPPUNIT_ASSERT_EQUAL( OUString("GENERAL"), rEnglishKeywords[NF_KEY_GENERAL] ); + CPPUNIT_ASSERT_EQUAL( OUString("NNN"), rEnglishKeywords[NF_KEY_NNN] ); + CPPUNIT_ASSERT_EQUAL( OUString("WW"), rEnglishKeywords[NF_KEY_WW] ); + CPPUNIT_ASSERT_EQUAL( OUString("MMMMM"), rEnglishKeywords[NF_KEY_MMMMM] ); + CPPUNIT_ASSERT_EQUAL( OUString("TRUE"), rEnglishKeywords[NF_KEY_TRUE] ); + CPPUNIT_ASSERT_EQUAL( OUString("FALSE"), rEnglishKeywords[NF_KEY_FALSE] ); + CPPUNIT_ASSERT_EQUAL( OUString("BOOLEAN"), rEnglishKeywords[NF_KEY_BOOLEAN] ); + CPPUNIT_ASSERT_EQUAL( OUString("COLOR"), rEnglishKeywords[NF_KEY_COLOR] ); + CPPUNIT_ASSERT_EQUAL( OUString("BLACK"), rEnglishKeywords[NF_KEY_BLACK] ); + CPPUNIT_ASSERT_EQUAL( OUString("BLUE"), rEnglishKeywords[NF_KEY_BLUE] ); + CPPUNIT_ASSERT_EQUAL( OUString("GREEN"), rEnglishKeywords[NF_KEY_GREEN] ); + CPPUNIT_ASSERT_EQUAL( OUString("CYAN"), rEnglishKeywords[NF_KEY_CYAN] ); + CPPUNIT_ASSERT_EQUAL( OUString("RED"), rEnglishKeywords[NF_KEY_RED] ); + CPPUNIT_ASSERT_EQUAL( OUString("MAGENTA"), rEnglishKeywords[NF_KEY_MAGENTA] ); + CPPUNIT_ASSERT_EQUAL( OUString("BROWN"), rEnglishKeywords[NF_KEY_BROWN] ); + CPPUNIT_ASSERT_EQUAL( OUString("GREY"), rEnglishKeywords[NF_KEY_GREY] ); + CPPUNIT_ASSERT_EQUAL( OUString("YELLOW"), rEnglishKeywords[NF_KEY_YELLOW] ); + CPPUNIT_ASSERT_EQUAL( OUString("WHITE"), rEnglishKeywords[NF_KEY_WHITE] ); + CPPUNIT_ASSERT_EQUAL( OUString("AAA"), rEnglishKeywords[NF_KEY_AAA]); + CPPUNIT_ASSERT_EQUAL( OUString("AAAA"), rEnglishKeywords[NF_KEY_AAAA] ); + CPPUNIT_ASSERT_EQUAL( OUString("E"), rEnglishKeywords[NF_KEY_EC] ); + CPPUNIT_ASSERT_EQUAL( OUString("EE"), rEnglishKeywords[NF_KEY_EEC] ); + CPPUNIT_ASSERT_EQUAL( OUString("G"), rEnglishKeywords[NF_KEY_G] ); + CPPUNIT_ASSERT_EQUAL( OUString("GG"), rEnglishKeywords[NF_KEY_GG] ); + CPPUNIT_ASSERT_EQUAL( OUString("GGG"), rEnglishKeywords[NF_KEY_GGG] ); + CPPUNIT_ASSERT_EQUAL( OUString("R"), rEnglishKeywords[NF_KEY_R] ); + CPPUNIT_ASSERT_EQUAL( OUString("RR"), rEnglishKeywords[NF_KEY_RR] ); + CPPUNIT_ASSERT_EQUAL( OUString("t"), rEnglishKeywords[NF_KEY_THAI_T] ); } void Test::testStandardColorIntegrity() @@ -1580,7 +1580,7 @@ void Test::testStandardColorIntegrity() SvNumberFormatter aFormatter(m_xContext, LANGUAGE_ENGLISH_US); const ::std::vector<Color> & rStandardColors = aFormatter.GetStandardColors(); const size_t nMaxDefaultColors = aFormatter.GetMaxDefaultColors(); - CPPUNIT_ASSERT_EQUAL( nMaxDefaultColors, size_t(NF_KEY_LASTCOLOR) - size_t(NF_KEY_FIRSTCOLOR) + 1 ); + CPPUNIT_ASSERT_EQUAL( size_t(NF_KEY_LASTCOLOR) - size_t(NF_KEY_FIRSTCOLOR) + 1, nMaxDefaultColors ); CPPUNIT_ASSERT_EQUAL( nMaxDefaultColors, rStandardColors.size() ); // Colors must follow same order as in sEnglishKeyword CPPUNIT_ASSERT_EQUAL( rStandardColors[0], COL_BLACK ); diff --git a/svtools/qa/unit/testHtmlWriter.cxx b/svtools/qa/unit/testHtmlWriter.cxx index 18cb409ff37b..2edf9665b607 100644 --- a/svtools/qa/unit/testHtmlWriter.cxx +++ b/svtools/qa/unit/testHtmlWriter.cxx @@ -67,7 +67,7 @@ void Test::testSingleElement() aHtml.end(); OString aString = extractFromStream(aStream); - CPPUNIT_ASSERT_EQUAL(aString, OString("<abc/>")); + CPPUNIT_ASSERT_EQUAL(OString("<abc/>"), aString); } { @@ -79,7 +79,7 @@ void Test::testSingleElement() OString aString = extractFromStream(aStream); - CPPUNIT_ASSERT_EQUAL(aString, OString("<abc/>")); + CPPUNIT_ASSERT_EQUAL(OString("<abc/>"), aString); } } @@ -96,7 +96,7 @@ void Test::testSingleElementWithAttributes() OString aString = extractFromStream(aStream); - CPPUNIT_ASSERT_EQUAL(aString, OString("<abc x=\"y\"/>")); + CPPUNIT_ASSERT_EQUAL(OString("<abc x=\"y\"/>"), aString); } { @@ -111,7 +111,7 @@ void Test::testSingleElementWithAttributes() OString aString = extractFromStream(aStream); - CPPUNIT_ASSERT_EQUAL(aString, OString("<abc x=\"y\" q=\"w\"/>")); + CPPUNIT_ASSERT_EQUAL(OString("<abc x=\"y\" q=\"w\"/>"), aString); } } @@ -126,7 +126,7 @@ void Test::testSingleElementWithContent() OString aString = extractFromStream(aStream); - CPPUNIT_ASSERT_EQUAL(aString, OString("<abc/>")); + CPPUNIT_ASSERT_EQUAL(OString("<abc/>"), aString); } void Test::testSingleElementWithContentAndAttributes() @@ -142,7 +142,7 @@ void Test::testSingleElementWithContentAndAttributes() OString aString = extractFromStream(aStream); - CPPUNIT_ASSERT_EQUAL(aString, OString("<abc x=\"y\" q=\"w\"/>")); + CPPUNIT_ASSERT_EQUAL(OString("<abc x=\"y\" q=\"w\"/>"), aString); } void Test::testNested() diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 2524b61be6c0..d15bdfdab62e 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -481,7 +481,7 @@ void SwMacrosTest::testFdo87530() CPPUNIT_ASSERT(xBasLib->isLibraryLoaded("BarLibrary")); Reference<container::XNameContainer> xLibrary(xBasLib->getByName("BarLibrary"), UNO_QUERY); Any module(xLibrary->getByName("BarModule")); - CPPUNIT_ASSERT_EQUAL(module.get<OUString>(), OUString("Sub Main\nEnd Sub\n")); + CPPUNIT_ASSERT_EQUAL(OUString("Sub Main\nEnd Sub\n"), module.get<OUString>()); // add a second module now - tdf#87530 happened here Reference<container::XNameContainer> xFooLib(xBasLib->createLibrary("FooLibrary")); @@ -512,7 +512,7 @@ void SwMacrosTest::testFdo87530() CPPUNIT_ASSERT(xBasLib->isLibraryLoaded("FooLibrary")); Reference<container::XNameContainer> xLibrary(xBasLib->getByName("FooLibrary"), UNO_QUERY); Any module(xLibrary->getByName("FooModule")); - CPPUNIT_ASSERT_EQUAL(module.get<OUString>(), OUString("Sub Main\nEnd Sub\n")); + CPPUNIT_ASSERT_EQUAL(OUString("Sub Main\nEnd Sub\n"), module.get<OUString>()); // close Reference<util::XCloseable>(xComponent, UNO_QUERY_THROW)->close(false); diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index d573c84ffd45..cf56a3ca0b79 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -748,7 +748,7 @@ void SwDocTest::testSwScanner() m_pDoc->getIDocumentContentOperations().InsertString(aPaM, aString); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(2)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(2), aDocStat.nWord); //turn on red-lining and show changes m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowDelete|RedlineFlags::ShowInsert); @@ -765,7 +765,7 @@ void SwDocTest::testSwScanner() aDocStat.Reset(); pTextNode->SetWordCountDirty(true); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //but word-counting the text should only count the non-deleted text - CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(1)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(1), aDocStat.nWord); pTextNode->SetWordCountDirty(true); @@ -1717,24 +1717,24 @@ void SwDocTest::testIntrusiveRing() vRings.push_back(&aRing3); vRings.push_back(&aRing4); vRings.push_back(&aRing5); - CPPUNIT_ASSERT_EQUAL(aRing1.GetRingContainer().size(), static_cast<size_t>(1)); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aRing1.GetRingContainer().size()); CPPUNIT_ASSERT(aRing1.lonely()); CPPUNIT_ASSERT(aRing2.lonely()); CPPUNIT_ASSERT(aRing3.lonely()); aRing2.MoveTo(&aRing1); aRing3.MoveTo(&aRing1); - CPPUNIT_ASSERT_EQUAL(aRing1.GetRingContainer().size(), static_cast<size_t>(3)); - CPPUNIT_ASSERT_EQUAL(aRing2.GetRingContainer().size(), static_cast<size_t>(3)); - CPPUNIT_ASSERT_EQUAL(aRing3.GetRingContainer().size(), static_cast<size_t>(3)); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), aRing1.GetRingContainer().size()); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), aRing2.GetRingContainer().size()); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), aRing3.GetRingContainer().size()); CPPUNIT_ASSERT(!aRing1.lonely()); CPPUNIT_ASSERT(!aRing2.lonely()); CPPUNIT_ASSERT(!aRing3.lonely()); aRing5.MoveTo(&aRing4); - CPPUNIT_ASSERT_EQUAL(aRing4.GetRingContainer().size(), static_cast<size_t>(2)); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), aRing4.GetRingContainer().size()); aRing4.GetRingContainer().merge(aRing1.GetRingContainer()); for(TestRing* pRing : vRings) { - CPPUNIT_ASSERT_EQUAL(pRing->GetRingContainer().size(), static_cast<size_t>(5)); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(5), pRing->GetRingContainer().size()); } for(std::vector<TestRing*>::iterator ppRing = vRings.begin(); ppRing != vRings.end(); ++ppRing) { @@ -1979,7 +1979,7 @@ void SwDocTest::test64kPageDescs() void SwDocTest::testTdf92308() { - CPPUNIT_ASSERT_EQUAL(m_pDoc->HasInvisibleContent(), false); + CPPUNIT_ASSERT_EQUAL(false, m_pDoc->HasInvisibleContent()); } void SwDocTest::testTableCellComparison() diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index d66208ccfdc5..64e1b1612e4c 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -462,7 +462,7 @@ protected: // the xpath expression evaluated to a value, not a node CPPUNIT_ASSERT_EQUAL_MESSAGE( "attr name should not be supplied when xpath evals to a value", - aAttribute.getLength(), sal_Int32(0)); + sal_Int32(0), aAttribute.getLength()); pXpathStrResult = xmlXPathCastToString(pXmlXpathObj); CPPUNIT_ASSERT_MESSAGE("xpath result cannot be cast to string", pXpathStrResult); diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index b207547fffb5..da7b168b61e3 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -547,8 +547,8 @@ DECLARE_SHELL_MAILMERGE_TEST(testTdf92623, "tdf92623.odt", "10-testing-addresses CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pIDMA->getBookmarksCount()); IDocumentMarkAccess::const_iterator_t mark = pIDMA->getAllMarksBegin(); // and it's a TEXT_FIELDMARK - CPPUNIT_ASSERT_EQUAL( sal_Int32(IDocumentMarkAccess::GetType( **mark )), - sal_Int32(IDocumentMarkAccess::MarkType::TEXT_FIELDMARK ) ); + CPPUNIT_ASSERT_EQUAL( sal_Int32(IDocumentMarkAccess::MarkType::TEXT_FIELDMARK), + sal_Int32(IDocumentMarkAccess::GetType( **mark )) ); sal_uLong src_pos = (*mark)->GetMarkPos().nNode.GetIndex(); // Get the size of the document in nodes @@ -579,7 +579,7 @@ DECLARE_SHELL_MAILMERGE_TEST(testTdf92623, "tdf92623.odt", "10-testing-addresses countFieldMarks++; } else // see previous TODO - CPPUNIT_ASSERT_EQUAL( sal_Int32(markType), sal_Int32(IDocumentMarkAccess::MarkType::UNO_BOOKMARK) ); + CPPUNIT_ASSERT_EQUAL( sal_Int32(IDocumentMarkAccess::MarkType::UNO_BOOKMARK), sal_Int32(markType) ); } CPPUNIT_ASSERT_EQUAL(sal_Int32(10), countFieldMarks); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index a4272feb459c..82469f0b2355 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -711,7 +711,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx") { uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx->getCount(), static_cast<sal_Int32>(3)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), xBookmarksByIdx->getCount()); uno::Reference<container::XNameAccess> xBookmarksByName(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT(xBookmarksByName->hasByName("B1")); CPPUNIT_ASSERT(xBookmarksByName->hasByName("B2")); @@ -719,11 +719,11 @@ DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx") // B1 uno::Reference<text::XTextContent> xContent1(xBookmarksByName->getByName("B1"), uno::UNO_QUERY); uno::Reference<text::XTextRange> xRange1(xContent1->getAnchor(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xRange1->getString(), OUString("ABB")); + CPPUNIT_ASSERT_EQUAL(OUString("ABB"), xRange1->getString()); // B2 uno::Reference<text::XTextContent> xContent2(xBookmarksByName->getByName("B2"), uno::UNO_QUERY); uno::Reference<text::XTextRange> xRange2(xContent2->getAnchor(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xRange2->getString(), OUString("BBC")); + CPPUNIT_ASSERT_EQUAL(OUString("BBC"), xRange2->getString()); // B3 -- testing a collapsed bookmark uno::Reference<text::XTextContent> xContent3(xBookmarksByName->getByName("B3"), uno::UNO_QUERY); uno::Reference<text::XTextRange> xRange3(xContent3->getAnchor(), uno::UNO_QUERY); @@ -734,14 +734,14 @@ DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx") xNeighborhoodCursor->goLeft(1, false); xNeighborhoodCursor->goRight(2, true); uno::Reference<text::XTextRange> xTextNeighborhood(xNeighborhoodCursor, uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xTextNeighborhood->getString(), OUString("AB")); + CPPUNIT_ASSERT_EQUAL(OUString("AB"), xTextNeighborhood->getString()); } DECLARE_OOXMLEXPORT_TEST(testTdf65955, "tdf65955.odt") { uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx->getCount(), static_cast<sal_Int32>(2)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xBookmarksByIdx->getCount()); uno::Reference<container::XNameAccess> xBookmarksByName(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT(xBookmarksByName->hasByName("a")); CPPUNIT_ASSERT(xBookmarksByName->hasByName("b")); @@ -759,13 +759,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf65955_2, "tdf65955_2.odt") { uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx->getCount(), static_cast<sal_Int32>(1)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), xBookmarksByIdx->getCount()); uno::Reference<container::XNameAccess> xBookmarksByName(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT(xBookmarksByName->hasByName("test")); uno::Reference<text::XTextContent> xContent3(xBookmarksByName->getByName("test"), uno::UNO_QUERY); uno::Reference<text::XTextRange> xRange3(xContent3->getAnchor(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(xRange3->getString(), OUString("foo bar")); + CPPUNIT_ASSERT_EQUAL(OUString("foo bar"), xRange3->getString()); } DECLARE_OOXMLEXPORT_TEST(testChtOutlineNumberingOoxml, "chtoutline.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index 9af55dde5410..23602ac34bb1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -1159,7 +1159,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90697_continuousBreaksComplex2,"tdf92724_continu CPPUNIT_ASSERT( xHeaderText->getString() != "Third section - First page header. No follow defined" ); // Same test stated differently: Pages 4 and 5 OUGHT to use "Second section header", but currently don't. Page 6 does. if( nPages <= 3 ) - CPPUNIT_ASSERT_EQUAL( xHeaderText->getString(), OUString("First section header") ); + CPPUNIT_ASSERT_EQUAL( OUString("First section header"), xHeaderText->getString() ); else CPPUNIT_ASSERT( xHeaderText->getString() == "First section header" || xHeaderText->getString() == "Second section header" ); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index b6125d78aedb..f8eb32fd8c3a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -1029,7 +1029,7 @@ DECLARE_OOXMLEXPORT_TEST(tdf66398_permissions, "tdf66398_permissions.docx") uno::Reference<container::XNameAccess> xBookmarksByName(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); // check: we have 2 bookmarks - CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx->getCount(), static_cast<sal_Int32>(2)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xBookmarksByIdx->getCount()); CPPUNIT_ASSERT(xBookmarksByName->hasByName("_GoBack")); CPPUNIT_ASSERT(xBookmarksByName->hasByName("permission-for-group:267014232:everyone")); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index 837111995c79..771378445fcb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -754,7 +754,7 @@ DECLARE_OOXMLEXPORT_TEST(testShapeThemePreservation, "shape-theme-preservation.d OUString sFillColor = getXPath(pXmlDocument, "/w:document/w:body/w:p[5]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:solidFill/a:srgbClr", "val"); - CPPUNIT_ASSERT_EQUAL(sFillColor.toInt32(16), sal_Int32(0x00b050)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00b050), sFillColor.toInt32(16)); sal_Int32 nLineColor = getXPath(pXmlDocument, "/w:document/w:body/w:p[5]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:solidFill/a:srgbClr", "val").toInt32(16); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index e3ae1ffad629..8cff697d4ca8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -163,14 +163,14 @@ DECLARE_OOXMLEXPORT_TEST(testFdo74745, "fdo74745.docx") { uno::Reference<text::XTextRange > paragraph = getParagraph(3); uno::Reference<text::XTextRange> text(paragraph, uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(text->getString(),OUString("09/02/14")); + CPPUNIT_ASSERT_EQUAL(OUString("09/02/14"), text->getString()); } DECLARE_OOXMLEXPORT_TEST(testFdo81486, "fdo81486.docx") { uno::Reference<text::XTextRange > paragraph = getParagraph(1); uno::Reference<text::XTextRange> text(paragraph, uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(text->getString(),OUString("CustomTitle")); + CPPUNIT_ASSERT_EQUAL(OUString("CustomTitle"), text->getString()); } DECLARE_OOXMLEXPORT_TEST(testFdo79738, "fdo79738.docx") @@ -666,7 +666,7 @@ DECLARE_OOXMLEXPORT_TEST(testFineTableDash, "tableborder-finedash.docx") uno::Reference<beans::XPropertySet> xTableProperties(xTables->getByIndex(0), uno::UNO_QUERY); table::TableBorder2 aBorder; xTableProperties->getPropertyValue("TableBorder2") >>= aBorder; - CPPUNIT_ASSERT_EQUAL(aBorder.RightLine.LineStyle, table::BorderLineStyle::FINE_DASHED); + CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::FINE_DASHED, aBorder.RightLine.LineStyle); } DECLARE_OOXMLEXPORT_TEST(testN792778, "n792778.docx") @@ -754,9 +754,9 @@ DECLARE_OOXMLEXPORT_TEST(testN779642, "n779642.docx") aFrame >>= xFrame; sal_Int16 nValue; xFrame->getPropertyValue("VertOrient") >>= nValue; - CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation", nValue, text::VertOrientation::BOTTOM); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation", text::VertOrientation::BOTTOM, nValue); xFrame->getPropertyValue("VertOrientRelation") >>= nValue; - CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation relation", nValue, text::RelOrientation::PAGE_PRINT_AREA); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation relation", text::RelOrientation::PAGE_PRINT_AREA, nValue); } DECLARE_OOXMLEXPORT_TEST(testTbLrHeight, "tblr-height.docx") @@ -907,7 +907,7 @@ DECLARE_OOXMLEXPORT_TEST(testN592908_Frame, "n592908-frame.docx") uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY); text::WrapTextMode eValue; xPropertySet->getPropertyValue("Surround") >>= eValue; - CPPUNIT_ASSERT_EQUAL(eValue, text::WrapTextMode_PARALLEL); + CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_PARALLEL, eValue); } DECLARE_OOXMLEXPORT_TEST(testN592908_Picture, "n592908-picture.docx") @@ -915,7 +915,7 @@ DECLARE_OOXMLEXPORT_TEST(testN592908_Picture, "n592908-picture.docx") uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY); text::WrapTextMode eValue; xPropertySet->getPropertyValue("Surround") >>= eValue; - CPPUNIT_ASSERT_EQUAL(eValue, text::WrapTextMode_PARALLEL); + CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_PARALLEL, eValue); } DECLARE_OOXMLEXPORT_TEST(testN779630, "n779630.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 9a10e7d0f2cb..2543f000a52d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -303,72 +303,72 @@ DECLARE_SW_EXPORT_TEST(testHFLinkToPrev, "headerfooter-link-to-prev.docx", nullp uno::Reference<style::XStyle> xPageStyle( xPageStyles->getByName(pageStyleName), uno::UNO_QUERY); // check page 1 header & footer text - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderText"), - OUString("First page header for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterText"), - OUString("First page footer for section 1 only")); + CPPUNIT_ASSERT_EQUAL(OUString("First page header for all sections"), + getHFText(xPageStyle, "HeaderText")); + CPPUNIT_ASSERT_EQUAL(OUString("First page footer for section 1 only"), + getHFText(xPageStyle, "FooterText")); // get LO page style for page 2, corresponding to docx section 1 xCursor->jumpToPage(2); pageStyleName = getProperty<OUString>(xCursor, "PageStyleName"); xPageStyle.set( xPageStyles->getByName(pageStyleName), uno::UNO_QUERY ); // check header & footer text - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderTextLeft"), - OUString("Even page header for section 1 only")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterTextLeft"), - OUString("Even page footer for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderText"), - OUString("Odd page header for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterText"), - OUString("Odd page footer for section 1 only")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page header for section 1 only"), + getHFText(xPageStyle, "HeaderTextLeft")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page footer for all sections"), + getHFText(xPageStyle, "FooterTextLeft")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page header for all sections"), + getHFText(xPageStyle, "HeaderText")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page footer for section 1 only"), + getHFText(xPageStyle, "FooterText")); // get LO page style for page 4, corresponding to docx section 2 first page xCursor->jumpToPage(4); pageStyleName = getProperty<OUString>(xCursor, "PageStyleName"); xPageStyle.set( xPageStyles->getByName(pageStyleName), uno::UNO_QUERY ); // check header & footer text - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderText"), - OUString("First page header for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterText"), - OUString("First page footer for sections 2 and 3 only")); + CPPUNIT_ASSERT_EQUAL(OUString("First page header for all sections"), + getHFText(xPageStyle, "HeaderText")); + CPPUNIT_ASSERT_EQUAL(OUString("First page footer for sections 2 and 3 only"), + getHFText(xPageStyle, "FooterText")); // get LO page style for page 5, corresponding to docx section 2 xCursor->jumpToPage(5); pageStyleName = getProperty<OUString>(xCursor, "PageStyleName"); xPageStyle.set( xPageStyles->getByName(pageStyleName), uno::UNO_QUERY ); // check header & footer text - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderTextLeft"), - OUString("Even page header for sections 2 and 3 only")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterTextLeft"), - OUString("Even page footer for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderText"), - OUString("Odd page header for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterText"), - OUString("Odd page footer for sections 2 and 3 only")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page header for sections 2 and 3 only"), + getHFText(xPageStyle, "HeaderTextLeft")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page footer for all sections"), + getHFText(xPageStyle, "FooterTextLeft")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page header for all sections"), + getHFText(xPageStyle, "HeaderText")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page footer for sections 2 and 3 only"), + getHFText(xPageStyle, "FooterText")); // get LO page style for page 7, corresponding to docx section 3 first page xCursor->jumpToPage(7); pageStyleName = getProperty<OUString>(xCursor, "PageStyleName"); xPageStyle.set( xPageStyles->getByName(pageStyleName), uno::UNO_QUERY ); // check header & footer text - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderText"), - OUString("First page header for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterText"), - OUString("First page footer for sections 2 and 3 only")); + CPPUNIT_ASSERT_EQUAL(OUString("First page header for all sections"), + getHFText(xPageStyle, "HeaderText")); + CPPUNIT_ASSERT_EQUAL(OUString("First page footer for sections 2 and 3 only"), + getHFText(xPageStyle, "FooterText")); // get LO page style for page 8, corresponding to docx section 3 xCursor->jumpToPage(8); pageStyleName = getProperty<OUString>(xCursor, "PageStyleName"); xPageStyle.set( xPageStyles->getByName(pageStyleName), uno::UNO_QUERY ); // check header & footer text - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderTextLeft"), - OUString("Even page header for sections 2 and 3 only")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterTextLeft"), - OUString("Even page footer for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "HeaderText"), - OUString("Odd page header for all sections")); - CPPUNIT_ASSERT_EQUAL(getHFText(xPageStyle, "FooterText"), - OUString("Odd page footer for sections 2 and 3 only")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page header for sections 2 and 3 only"), + getHFText(xPageStyle, "HeaderTextLeft")); + CPPUNIT_ASSERT_EQUAL(OUString("Even page footer for all sections"), + getHFText(xPageStyle, "FooterTextLeft")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page header for all sections"), + getHFText(xPageStyle, "HeaderText")); + CPPUNIT_ASSERT_EQUAL(OUString("Odd page footer for sections 2 and 3 only"), + getHFText(xPageStyle, "FooterText")); } DECLARE_OOXMLEXPORT_TEST(testRhbz988516, "rhbz988516.docx") diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 4743cbc8afed..cb53c31ccfa1 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -334,7 +334,7 @@ DECLARE_OOXMLIMPORT_TEST(testN758883, "n758883.docx") xPropertySet.set(getShape(1), uno::UNO_QUERY); text::WrapTextMode eValue; xPropertySet->getPropertyValue("Surround") >>= eValue; - CPPUNIT_ASSERT_EQUAL(eValue, text::WrapTextMode_THROUGH); + CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_THROUGH, eValue); /* * 5th problem: anchor type of the second textbox was wrong. @@ -486,10 +486,10 @@ DECLARE_OOXMLIMPORT_TEST(testN773061, "n773061.docx") uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL( getProperty< sal_Int32 >( xFrame, "LeftBorderDistance" ), sal_Int32( 0 )); - CPPUNIT_ASSERT_EQUAL( getProperty< sal_Int32 >( xFrame, "TopBorderDistance" ), sal_Int32( 0 )); - CPPUNIT_ASSERT_EQUAL( getProperty< sal_Int32 >( xFrame, "RightBorderDistance" ), sal_Int32( 0 )); - CPPUNIT_ASSERT_EQUAL( getProperty< sal_Int32 >( xFrame, "BottomBorderDistance" ), sal_Int32( 0 )); + CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), getProperty< sal_Int32 >( xFrame, "LeftBorderDistance" ) ); + CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), getProperty< sal_Int32 >( xFrame, "TopBorderDistance" ) ); + CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), getProperty< sal_Int32 >( xFrame, "RightBorderDistance" ) ); + CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), getProperty< sal_Int32 >( xFrame, "BottomBorderDistance" ) ); } DECLARE_OOXMLIMPORT_TEST(testN780645, "n780645.docx") diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index eb3b42a31387..f01b0bfe37e3 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -41,7 +41,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx") { // Table was imported into a text frame which led to a one page document // Originally the table takes two pages, so Writer should import it accordingly. - CPPUNIT_ASSERT_EQUAL(getPages(), 2); + CPPUNIT_ASSERT_EQUAL(2, getPages()); } DECLARE_OOXMLIMPORT_TEST(testTdf108849, "tdf108849.docx") @@ -172,7 +172,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") // DOCX: Textbox wrap differs in MSO and LO // Both should layout text regardless of existing text box // and as result only one page should be generated. -DECLARE_OOXMLIMPORT_TEST(testTdf113182, "tdf113182.docx") { CPPUNIT_ASSERT_EQUAL(getPages(), 1); } +DECLARE_OOXMLIMPORT_TEST(testTdf113182, "tdf113182.docx") { CPPUNIT_ASSERT_EQUAL(1, getPages()); } DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") { diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 2d4aa322db4c..924ff04f6911 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -2393,7 +2393,7 @@ void SwUiWriterTest::testTdf72788() pCursor->GetNode().GetTextNode()->GetAttr(aSet, 5, 12); SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT); //Check that bold is active on the selection and it's in aSet - CPPUNIT_ASSERT_EQUAL((*pPoolItem == aWeightItem), true); + CPPUNIT_ASSERT_EQUAL(true, (*pPoolItem == aWeightItem)); //Make selection to remove formatting in first paragraph //[this is text //]more text @@ -2412,7 +2412,7 @@ void SwUiWriterTest::testTdf72788() //Check that bold is removed in first paragraph pTextNode->GetAttr(aSet, 5, 12); SfxPoolItem const * pPoolItem2 = aSet.GetItem(RES_CHRATR_WEIGHT); - CPPUNIT_ASSERT_EQUAL((*pPoolItem2 != aWeightItem), true); + CPPUNIT_ASSERT_EQUAL(true, (*pPoolItem2 != aWeightItem)); } void SwUiWriterTest::testTdf60967() @@ -3766,14 +3766,14 @@ void SwUiWriterTest::testUndoCharAttribute() pCursor->GetNode().GetTextNode()->GetAttr(aSet, 10, 19); SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT); // Check that bold is active on the selection; checks if it's in aSet - CPPUNIT_ASSERT_EQUAL((*pPoolItem == aWeightItem), true); + CPPUNIT_ASSERT_EQUAL(true, (*pPoolItem == aWeightItem)); // Invoke Undo rUndoManager.Undo(); // Check that bold is no longer active aSet.ClearItem(RES_CHRATR_WEIGHT); pCursor->GetNode().GetTextNode()->GetAttr(aSet, 10, 19); pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT); - CPPUNIT_ASSERT_EQUAL((*pPoolItem == aWeightItem), false); + CPPUNIT_ASSERT_EQUAL(false, (*pPoolItem == aWeightItem)); } void SwUiWriterTest::testUndoDelAsChar() diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 0808a6d4f9e7..184f4ad34c52 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -122,7 +122,7 @@ OString loadFile(const OUString& rURL) { osl::File aFile(rURL); osl::FileBase::RC eStatus = aFile.open(osl_File_OpenFlag_Read); - CPPUNIT_ASSERT_EQUAL(eStatus, osl::FileBase::E_None); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, eStatus); sal_uInt64 nSize; aFile.getSize(nSize); std::unique_ptr<char[]> aBytes(new char[nSize]); diff --git a/test/source/sheet/xviewpane.cxx b/test/source/sheet/xviewpane.cxx index ef3a317c1b69..5ea508bf82bf 100644 --- a/test/source/sheet/xviewpane.cxx +++ b/test/source/sheet/xviewpane.cxx @@ -36,16 +36,16 @@ void XViewPane::testFirstVisibleRow() void XViewPane::testVisibleRange() { - sal_Int32 nCol = 5; - sal_Int32 nRow = 3; + constexpr sal_Int32 nCol = 5; + constexpr sal_Int32 nRow = 3; uno::Reference < sheet::XViewPane > xViewPane(init(),UNO_QUERY_THROW); xViewPane->setFirstVisibleColumn(nCol); xViewPane->setFirstVisibleRow(nRow); table::CellRangeAddress aCellRangeAddress = xViewPane->getVisibleRange(); - CPPUNIT_ASSERT_EQUAL(aCellRangeAddress.Sheet, short(0)); - CPPUNIT_ASSERT_EQUAL(aCellRangeAddress.StartRow, nRow); - CPPUNIT_ASSERT_EQUAL(aCellRangeAddress.StartColumn, nCol); + CPPUNIT_ASSERT_EQUAL(short(0), aCellRangeAddress.Sheet); + CPPUNIT_ASSERT_EQUAL(nRow, aCellRangeAddress.StartRow); + CPPUNIT_ASSERT_EQUAL(nCol, aCellRangeAddress.StartColumn); } } diff --git a/tools/qa/cppunit/test_color.cxx b/tools/qa/cppunit/test_color.cxx index 97faa2d9cf3b..15d90e388e60 100644 --- a/tools/qa/cppunit/test_color.cxx +++ b/tools/qa/cppunit/test_color.cxx @@ -36,27 +36,27 @@ void Test::test_asRGBColor() { Color aColor; aColor = COL_BLACK; - CPPUNIT_ASSERT_EQUAL(aColor.AsRGBHexString(), OUString("000000")); + CPPUNIT_ASSERT_EQUAL(OUString("000000"), aColor.AsRGBHexString()); aColor = COL_WHITE; - CPPUNIT_ASSERT_EQUAL(aColor.AsRGBHexString(), OUString("ffffff")); + CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aColor.AsRGBHexString()); aColor = COL_RED; - CPPUNIT_ASSERT_EQUAL(aColor.AsRGBHexString(), OUString("800000")); + CPPUNIT_ASSERT_EQUAL(OUString("800000"), aColor.AsRGBHexString()); aColor = COL_TRANSPARENT; - CPPUNIT_ASSERT_EQUAL(aColor.AsRGBHexString(), OUString("ffffff")); + CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aColor.AsRGBHexString()); aColor = COL_BLUE; - CPPUNIT_ASSERT_EQUAL(aColor.AsRGBHexString(), OUString("000080")); + CPPUNIT_ASSERT_EQUAL(OUString("000080"), aColor.AsRGBHexString()); aColor.SetRed(0x12); aColor.SetGreen(0x34); aColor.SetBlue(0x56); - CPPUNIT_ASSERT_EQUAL(aColor.AsRGBHexString(), OUString("123456")); + CPPUNIT_ASSERT_EQUAL(OUString("123456"), aColor.AsRGBHexString()); aColor = COL_AUTO; - CPPUNIT_ASSERT_EQUAL(aColor.AsRGBHexString(), OUString("ffffff")); + CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aColor.AsRGBHexString()); } void Test::test_readAndWriteStream() diff --git a/vcl/qa/cppunit/bitmapcolor.cxx b/vcl/qa/cppunit/bitmapcolor.cxx index d4594fa22c02..2953c0d0eab8 100644 --- a/vcl/qa/cppunit/bitmapcolor.cxx +++ b/vcl/qa/cppunit/bitmapcolor.cxx @@ -55,10 +55,10 @@ void BitmapColorTest::defaultConstructor() { BitmapColor aBmpColor; - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(0), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0), aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } void BitmapColorTest::colorValueConstructor() @@ -66,33 +66,33 @@ void BitmapColorTest::colorValueConstructor() { BitmapColor aBmpColor(0, 0, 0); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(0), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } { BitmapColor aBmpColor(128, 128, 128); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(128)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(128)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), - static_cast<sal_uInt8>(128)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(128), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(128), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(128), + aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } { BitmapColor aBmpColor(255, 255, 255); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), - static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(255), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(255), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(255), + aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } } @@ -102,35 +102,35 @@ void BitmapColorTest::colorClassConstructor() Color aColor(0, 0, 0); BitmapColor aBmpColor(aColor); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(0), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(0), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(0), aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } { Color aColor(127, 127, 127); BitmapColor aBmpColor(aColor); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(127)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(127)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), - static_cast<sal_uInt8>(127)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(127), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(127), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(127), + aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } { Color aColor(255, 255, 255); BitmapColor aBmpColor(aColor); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", aBmpColor.GetRed(), static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", aBmpColor.GetGreen(), - static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", aBmpColor.GetBlue(), - static_cast<sal_uInt8>(255)); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", aBmpColor.IsIndex(), false); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Red wrong", static_cast<sal_uInt8>(255), aBmpColor.GetRed()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Green wrong", static_cast<sal_uInt8>(255), + aBmpColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Blue wrong", static_cast<sal_uInt8>(255), + aBmpColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Index wrong", false, aBmpColor.IsIndex()); } } @@ -139,13 +139,13 @@ void BitmapColorTest::setValue() BitmapColor aBmpColor; aBmpColor.SetRed(127); - CPPUNIT_ASSERT_EQUAL(aBmpColor.GetRed(), static_cast<sal_uInt8>(127)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(127), aBmpColor.GetRed()); aBmpColor.SetGreen(127); - CPPUNIT_ASSERT_EQUAL(aBmpColor.GetGreen(), static_cast<sal_uInt8>(127)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(127), aBmpColor.GetGreen()); aBmpColor.SetBlue(127); - CPPUNIT_ASSERT_EQUAL(aBmpColor.GetBlue(), static_cast<sal_uInt8>(127)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(127), aBmpColor.GetBlue()); } void BitmapColorTest::invert() @@ -153,10 +153,9 @@ void BitmapColorTest::invert() BitmapColor aBmpColor(255, 255, 255); BitmapColor aInvertedColor = aBmpColor.Invert(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Inverted red wrong", aInvertedColor.GetRed(), - static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL(aInvertedColor.GetGreen(), static_cast<sal_uInt8>(0)); - CPPUNIT_ASSERT_EQUAL(aInvertedColor.GetBlue(), static_cast<sal_uInt8>(0)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(0), aInvertedColor.GetRed()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(0), aInvertedColor.GetGreen()); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt8>(0), aInvertedColor.GetBlue()); } void BitmapColorTest::getLuminance() diff --git a/vcl/qa/cppunit/fontmetric.cxx b/vcl/qa/cppunit/fontmetric.cxx index 4b4b53899a3e..ac28f34ce51d 100644 --- a/vcl/qa/cppunit/fontmetric.cxx +++ b/vcl/qa/cppunit/fontmetric.cxx @@ -55,27 +55,27 @@ void VclFontMetricTest::testSpacings() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetAscent(), 0L ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetDescent(), 0L ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetExternalLeading(), 0L ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetInternalLeading(), 0L ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetLineHeight(), 0L ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetAscent() ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetDescent() ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetExternalLeading() ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetInternalLeading() ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetLineHeight() ); aFontMetric.SetAscent( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetAscent(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetAscent() ); aFontMetric.SetDescent( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetDescent(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetDescent() ); aFontMetric.SetExternalLeading( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetExternalLeading(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetExternalLeading() ); aFontMetric.SetInternalLeading( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetInternalLeading(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetInternalLeading() ); aFontMetric.SetLineHeight( 100 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetLineHeight(), 100L ); + CPPUNIT_ASSERT_EQUAL( 100L, aFontMetric.GetLineHeight() ); } void VclFontMetricTest::testSlant() @@ -83,10 +83,10 @@ void VclFontMetricTest::testSlant() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetSlant(), 0L ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetSlant() ); aFontMetric.SetSlant( 45 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetSlant(), 45L ); + CPPUNIT_ASSERT_EQUAL( 45L, aFontMetric.GetSlant() ); } void VclFontMetricTest::testBulletOffset() @@ -94,10 +94,10 @@ void VclFontMetricTest::testBulletOffset() // default constructor should set scalable flag to false FontMetric aFontMetric; - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetBulletOffset(), 0L ); + CPPUNIT_ASSERT_EQUAL( 0L, aFontMetric.GetBulletOffset() ); aFontMetric.SetBulletOffset( 45 ); - CPPUNIT_ASSERT_EQUAL( aFontMetric.GetBulletOffset(), 45L ); + CPPUNIT_ASSERT_EQUAL( 45L, aFontMetric.GetBulletOffset() ); } void VclFontMetricTest::testEqualityOperator() diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index aaaf9ec8d86e..1e57f27884bd 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -444,7 +444,7 @@ void TimerTest::testInvokedReStart() sal_Int32 nCount = 0; IdleInvokedReStart aIdle( nCount ); Scheduler::ProcessEventsToIdle(); - CPPUNIT_ASSERT_EQUAL( nCount, sal_Int32(2) ); + CPPUNIT_ASSERT_EQUAL( sal_Int32(2), nCount ); } @@ -507,7 +507,7 @@ public: : AutoIdle( pDebugName ) , mrCount( rCount ) { - CPPUNIT_ASSERT_EQUAL( mrCount, sal_uInt32(0) ); + CPPUNIT_ASSERT_EQUAL( sal_uInt32(0), mrCount ); SetInvokeHandler( LINK( this, TestAutoIdleRR, IdleRRHdl ) ); Start(); } diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index 0899b4a64ad1..773458179145 100644 --- a/writerperfect/qa/unit/WPXSvStreamTest.cxx +++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx @@ -200,7 +200,7 @@ void WPXSvStreamTest::testSeekSet() CPPUNIT_ASSERT(!pInput->isEnd()); CPPUNIT_ASSERT_EQUAL(0, pInput->seek(nLen, RVNG_SEEK_SET)); - CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen); + CPPUNIT_ASSERT_EQUAL(nLen, pInput->tell()); CPPUNIT_ASSERT(pInput->isEnd()); // go back to the beginning @@ -215,7 +215,7 @@ void WPXSvStreamTest::testSeekSet() CPPUNIT_ASSERT(!pInput->isEnd()); CPPUNIT_ASSERT(0 != pInput->seek(nLen + 1, RVNG_SEEK_SET)); - CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen); + CPPUNIT_ASSERT_EQUAL(nLen, pInput->tell()); CPPUNIT_ASSERT(pInput->isEnd()); } @@ -252,7 +252,7 @@ void WPXSvStreamTest::testSeekCur() CPPUNIT_ASSERT(!pInput->isEnd()); CPPUNIT_ASSERT(0 != pInput->seek(nLen + 1, RVNG_SEEK_CUR)); - CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen); + CPPUNIT_ASSERT_EQUAL(nLen, pInput->tell()); CPPUNIT_ASSERT(pInput->isEnd()); } @@ -267,11 +267,11 @@ void WPXSvStreamTest::testSeekEnd() // valid seeks CPPUNIT_ASSERT_EQUAL(0, pInput->seek(0, RVNG_SEEK_END)); - CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen); + CPPUNIT_ASSERT_EQUAL(nLen, pInput->tell()); CPPUNIT_ASSERT(pInput->isEnd()); CPPUNIT_ASSERT_EQUAL(0, pInput->seek(-1, RVNG_SEEK_END)); - CPPUNIT_ASSERT_EQUAL(pInput->tell(), (nLen - 1)); + CPPUNIT_ASSERT_EQUAL(nLen - 1, pInput->tell()); CPPUNIT_ASSERT(!pInput->isEnd()); CPPUNIT_ASSERT_EQUAL(0, pInput->seek(-nLen, RVNG_SEEK_END)); @@ -284,7 +284,7 @@ void WPXSvStreamTest::testSeekEnd() // invalid seeks CPPUNIT_ASSERT(0 != pInput->seek(1, RVNG_SEEK_END)); - CPPUNIT_ASSERT_EQUAL(pInput->tell(), nLen); + CPPUNIT_ASSERT_EQUAL(nLen, pInput->tell()); CPPUNIT_ASSERT(pInput->isEnd()); CPPUNIT_ASSERT(0 != pInput->seek(-nLen - 1, RVNG_SEEK_END)); diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index ece73c8dcdb2..99f70172c27a 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -833,7 +833,7 @@ void SigningTest::testODFGoodGPG() (OString::number( static_cast<std::underlying_type<SignatureState>::type>(nActual)) .getStr()), - nActual, SignatureState::OK); + SignatureState::OK, nActual); } void SigningTest::testODFUntrustedGoodGPG() @@ -851,7 +851,7 @@ void SigningTest::testODFUntrustedGoodGPG() (OString::number( static_cast<std::underlying_type<SignatureState>::type>(nActual)) .getStr()), - nActual, SignatureState::NOTVALIDATED); + SignatureState::NOTVALIDATED, nActual); } void SigningTest::testODFBrokenStreamGPG() |