diff options
59 files changed, 6632 insertions, 2821 deletions
diff --git a/basegfx/test/B2DHomMatrixTest.cxx b/basegfx/test/B2DHomMatrixTest.cxx index e5b923e6dd82..04201ca19c0c 100644 --- a/basegfx/test/B2DHomMatrixTest.cxx +++ b/basegfx/test/B2DHomMatrixTest.cxx @@ -440,8 +440,8 @@ public: 1E-12); CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("decompose: error test J1", 3938.0, aDScale.getY(), 1E-12); - CPPUNIT_ASSERT_MESSAGE("decompose: error test J1", - aDTrans.getX() == 10482 && aDTrans.getY() == 4921); + CPPUNIT_ASSERT_EQUAL_MESSAGE("decompose: error test J1", 10482.0, aDTrans.getX()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("decompose: error test J1", 4921.0, aDTrans.getY()); CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("decompose: error test J1", F_PI, fDRot, 1E-12); } diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index c8b4c03755e7..309381d80224 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -1817,11 +1817,13 @@ void Chart2ExportTest::testTitleManualLayoutXLSX() OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:x", "val"); double nX = aXVal.toDouble(); - CPPUNIT_ASSERT(nX > 0 && nX < 1); + CPPUNIT_ASSERT(nX > 0); + CPPUNIT_ASSERT(nX < 1); OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:y", "val"); double nY = aYVal.toDouble(); - CPPUNIT_ASSERT(nY > 0 && nY < 1); + CPPUNIT_ASSERT(nY > 0); + CPPUNIT_ASSERT(nY < 1); CPPUNIT_ASSERT(nX != nY); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:bodyPr", "rot", "1200000"); @@ -1839,20 +1841,24 @@ void Chart2ExportTest::testPlotAreaManualLayoutXLSX() OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:x", "val"); double nX = aXVal.toDouble(); - CPPUNIT_ASSERT(nX > 0 && nX < 1); + CPPUNIT_ASSERT(nX > 0); + CPPUNIT_ASSERT(nX < 1); OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:y", "val"); double nY = aYVal.toDouble(); - CPPUNIT_ASSERT(nY > 0 && nY < 1); + CPPUNIT_ASSERT(nY > 0); + CPPUNIT_ASSERT(nY < 1); CPPUNIT_ASSERT(nX != nY); OUString aWVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:w", "val"); double nW = aWVal.toDouble(); - CPPUNIT_ASSERT(nW > 0 && nW < 1); + CPPUNIT_ASSERT(nW > 0); + CPPUNIT_ASSERT(nW < 1); OUString aHVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:h", "val"); double nH = aHVal.toDouble(); - CPPUNIT_ASSERT(nH > 0 && nH < 1); + CPPUNIT_ASSERT(nH > 0); + CPPUNIT_ASSERT(nH < 1); CPPUNIT_ASSERT(nH != nW); } @@ -1868,20 +1874,24 @@ void Chart2ExportTest::testLegendManualLayoutXLSX() OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:x", "val"); double nX = aXVal.toDouble(); - CPPUNIT_ASSERT(nX > 0 && nX < 1); + CPPUNIT_ASSERT(nX > 0); + CPPUNIT_ASSERT(nX < 1); OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:y", "val"); double nY = aYVal.toDouble(); - CPPUNIT_ASSERT(nY > 0 && nY < 1); + CPPUNIT_ASSERT(nY > 0); + CPPUNIT_ASSERT(nY < 1); CPPUNIT_ASSERT(nX != nY); OUString aWVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:w", "val"); double nW = aWVal.toDouble(); - CPPUNIT_ASSERT(nW > 0 && nW < 1); + CPPUNIT_ASSERT(nW > 0); + CPPUNIT_ASSERT(nW < 1); OUString aHVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:h", "val"); double nH = aHVal.toDouble(); - CPPUNIT_ASSERT(nH > 0 && nH < 1); + CPPUNIT_ASSERT(nH > 0); + CPPUNIT_ASSERT(nH < 1); CPPUNIT_ASSERT(nH != nW); // Make sure that default text font size is preserved after export @@ -2946,7 +2956,8 @@ void Chart2ExportTest::testTdf134255() CPPUNIT_ASSERT(xDataSeries.is()); Reference< beans::XPropertySet > xPropSet(xDataSeries, UNO_QUERY_THROW); bool bWrap = false; - CPPUNIT_ASSERT((xPropSet->getPropertyValue("TextWordWrap") >>= bWrap) && bWrap); + CPPUNIT_ASSERT((xPropSet->getPropertyValue("TextWordWrap") >>= bWrap)); + CPPUNIT_ASSERT(bWrap); // export test xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 57c7227b49c1..4b425a386b70 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -707,7 +707,8 @@ void Chart2ImportTest::testPPTXPercentageNumberFormats() Reference<beans::XPropertySet> xPS(xYAxis, uno::UNO_QUERY_THROW); bool bLinkNumberFormatToSource = true; bool bSuccess = xPS->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; - CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to false.", bSuccess && !bLinkNumberFormatToSource); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to false.", bSuccess); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to false.", !bLinkNumberFormatToSource); // FIXME: This should be in fact "0.00%". // see TODO in oox/source/drawingml/chart/modelbase.cxx @@ -1049,19 +1050,22 @@ void Chart2ImportTest::testTdf124817() xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropSet_0(xDataSeries, uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT((xPropSet_0->getPropertyValue("Symbol") >>= aSymblProp) && (aSymblProp.Style == chart2::SymbolStyle_NONE)); + CPPUNIT_ASSERT((xPropSet_0->getPropertyValue("Symbol") >>= aSymblProp)); + CPPUNIT_ASSERT_EQUAL(chart2::SymbolStyle_NONE, aSymblProp.Style); // Check the symbol of data series 2 (marker style square) xDataSeries = getDataSeriesFromDoc(xChartDoc, 1); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropSet_1(xDataSeries, uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT((xPropSet_1->getPropertyValue("Symbol") >>= aSymblProp) && (aSymblProp.FillColor == static_cast<sal_Int32>(0xED7D31))); + CPPUNIT_ASSERT((xPropSet_1->getPropertyValue("Symbol") >>= aSymblProp)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xED7D31), aSymblProp.FillColor); // Check the symbol of data series 3 (marker style diagonal cross) xDataSeries = getDataSeriesFromDoc(xChartDoc, 2); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropSet_2(xDataSeries, uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT((xPropSet_2->getPropertyValue("Symbol") >>= aSymblProp) && (aSymblProp.BorderColor == static_cast<sal_Int32>(0xFF0000))); + CPPUNIT_ASSERT((xPropSet_2->getPropertyValue("Symbol") >>= aSymblProp)); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xFF0000), aSymblProp.BorderColor); } void Chart2ImportTest::testTdf126033() @@ -1284,7 +1288,8 @@ void Chart2ImportTest::testNumberFormatsXLSX() bool bSuccess = xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(false, bSuccess); bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; - CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess && bLinkNumberFormatToSource); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bLinkNumberFormatToSource); xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW); xPropertySet->getPropertyValue("Label") >>= aLabel; @@ -1295,7 +1300,8 @@ void Chart2ImportTest::testNumberFormatsXLSX() bSuccess = xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(false, bSuccess); bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; - CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess && bLinkNumberFormatToSource); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bLinkNumberFormatToSource); xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW); xPropertySet->getPropertyValue("Label") >>= aLabel; @@ -1306,7 +1312,8 @@ void Chart2ImportTest::testNumberFormatsXLSX() bSuccess = xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(false, bSuccess); bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; - CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess && bLinkNumberFormatToSource); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bLinkNumberFormatToSource); } void Chart2ImportTest::testNumberFormatsDOCX() @@ -1371,7 +1378,8 @@ void Chart2ImportTest::testPercentageNumberFormatsDOCX() CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent); bool bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; - CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess && bLinkNumberFormatToSource); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess); + CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bLinkNumberFormatToSource); } void Chart2ImportTest::testAutoTitleDelDefaultValue2007XLSX() diff --git a/compilerplugins/clang/cppunitassertequals.cxx b/compilerplugins/clang/cppunitassertequals.cxx index 4f5e364540c8..56f13b822163 100644 --- a/compilerplugins/clang/cppunitassertequals.cxx +++ b/compilerplugins/clang/cppunitassertequals.cxx @@ -191,7 +191,6 @@ void CppunitAssertEquals::checkExpr( reportEquals(range, name, op == BO_NE, e->getLHS(), e->getRHS()); return; } -#if 0 // TODO: enable later if ((!negated && op == BO_LAnd) || (negated && op == BO_LOr)) { report( DiagnosticsEngine::Warning, @@ -199,7 +198,6 @@ void CppunitAssertEquals::checkExpr( << name << range; return; } -#endif return; } if (auto const e = dyn_cast<CXXOperatorCallExpr>(expr)) { diff --git a/compilerplugins/clang/test/cppunitassertequals.cxx b/compilerplugins/clang/test/cppunitassertequals.cxx index 0eb1b4e3cfd9..9fe35cfc6919 100644 --- a/compilerplugins/clang/test/cppunitassertequals.cxx +++ b/compilerplugins/clang/test/cppunitassertequals.cxx @@ -23,14 +23,12 @@ void test( bool b1, bool b2, OUString const & s1, OUString const & s2, T t, void * p, std::nullptr_t n) { CppUnit::Asserter::failIf(b1,""); -#if 0 // TODO: enable later CPPUNIT_ASSERT(b1 && b2); // expected-error {{rather split into two CPPUNIT_ASSERT [loplugin:cppunitassertequals]}} CPPUNIT_ASSERT((b1 && b2)); // expected-error {{rather split into two CPPUNIT_ASSERT [loplugin:cppunitassertequals]}} CPPUNIT_ASSERT(!(b1 || b2)); // expected-error {{rather split into two CPPUNIT_ASSERT [loplugin:cppunitassertequals]}} CPPUNIT_ASSERT(!(b1 && b2)); CPPUNIT_ASSERT(!!(b1 && b2)); // expected-error {{rather split into two CPPUNIT_ASSERT [loplugin:cppunitassertequals]}} CPPUNIT_ASSERT_MESSAGE("", b1 && b2); // expected-error {{rather split into two CPPUNIT_ASSERT_MESSAGE [loplugin:cppunitassertequals]}} -#endif CPPUNIT_ASSERT(b1 == b2); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}} CPPUNIT_ASSERT(b1 != b2); CPPUNIT_ASSERT((b1 == b2)); // expected-error {{rather call CPPUNIT_ASSERT_EQUAL when comparing 'bool' and 'bool' (or rewrite as an explicit operator == call when the operator itself is the topic) [loplugin:cppunitassertequals]}} diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 7dfed7a714de..06fa51168b64 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -458,77 +458,98 @@ void Test::testByte() { } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(1), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(1), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(1), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(1), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(1), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(1), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("float", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(1), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("double", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 1.0, b); } { sal_Unicode b = '2'; if (std::is_same< sal_Unicode, sal_uInt16 >::value) { - CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("@sal_Unicode", u'\u0001', b); } else { - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -537,89 +558,113 @@ void Test::testShort() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_Int16>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(1), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(1), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(1), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(1), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(1), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(1), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("float", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(1), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("double", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 1.0, b); } { sal_Unicode b = '2'; if (std::is_same< sal_Unicode, sal_uInt16 >::value) { - CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("@sal_Unicode", u'\u0001', b); } else { - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -630,89 +675,113 @@ void Test::testUnsignedShort() { bool(a.getValueType() == cppu::UnoType<cppu::UnoUnsignedShortType>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(1), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(1), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(1), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(1), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(1), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(1), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("float", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(1), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("double", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 1.0, b); } { sal_Unicode b = '2'; if (std::is_same< sal_Unicode, sal_uInt16 >::value) { - CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("@sal_Unicode", u'\u0001', b); } else { - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -721,85 +790,108 @@ void Test::testLong() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_Int32>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(1), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(1), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(1), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(1), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("double", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 1.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -808,85 +900,108 @@ void Test::testUnsignedLong() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_uInt32>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(1), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(1), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(1), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(1), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("double", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 1.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -895,85 +1010,108 @@ void Test::testHyper() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_Int64>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(1), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(1), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -982,85 +1120,108 @@ void Test::testUnsignedHyper() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<sal_uInt64>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(1), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(1), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1069,85 +1230,108 @@ void Test::testFloat() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<float>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("float", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(1), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("double", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 1.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1156,85 +1340,108 @@ void Test::testDouble() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<double>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", (a >>= b) && b == 1); + CPPUNIT_ASSERT_MESSAGE("double", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 1.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1244,89 +1451,113 @@ void Test::testChar() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<cppu::UnoCharType>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; if (std::is_same< sal_Unicode, sal_uInt16 >::value) { - CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("@sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("@sal_Unicode", u'2', b); } else { - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", (a >>= b) && b == '1'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'1', b); } } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1335,85 +1566,108 @@ void Test::testString() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<OUString>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", (a >>= b) && b == "1" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", (a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("1"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1422,84 +1676,106 @@ void Test::testType() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<css::uno::Type>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Type", (a >>= b) && b == cppu::UnoType<sal_Int32>::get()); + "css::uno::Type", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", cppu::UnoType<sal_Int32>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1511,91 +1787,120 @@ void Test::testSequence() { == cppu::UnoType<css::uno::Sequence<sal_Int32>>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { css::uno::Sequence< sal_Int32 > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<sal_Int32>", - (a >>= b) && b.getLength() == 1 && b[0] == 1); + (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<sal_Int32>", + sal_Int32(1), b.getLength()); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<sal_Int32>", + sal_Int32(1), b[0]); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1604,89 +1909,113 @@ void Test::testEnum() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Enum2>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Enum2 b = Enum2_M2; - CPPUNIT_ASSERT_MESSAGE("Enum2", (a >>= b) && b == Enum2_M1); + CPPUNIT_ASSERT_MESSAGE("Enum2", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum2", Enum2_M1, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1695,98 +2024,127 @@ void Test::testStruct() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Struct2a>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Struct2 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct2", (a >>= b) && b.member == 1); + CPPUNIT_ASSERT_MESSAGE("Struct2", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct2", sal_Int32(1), b.member); } { Struct2a b(2, 2); CPPUNIT_ASSERT_MESSAGE( - "Struct2a", (a >>= b) && b.member == 1 && b.member2 == 3); + "Struct2a", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "Struct2a", sal_Int32(1), b.member); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "Struct2a", sal_Int32(3), b.member2); } { Struct2b b(2, 2, 2); - CPPUNIT_ASSERT_MESSAGE("Struct2b", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct2b", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct2b", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1807,103 +2165,132 @@ void Test::testException() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Exception2a>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { Exception2 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception2", (a >>= b) && b.member == 1); + CPPUNIT_ASSERT_MESSAGE("Exception2", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception2", sal_Int32(1), b.member); } { Exception2a b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2, 2); CPPUNIT_ASSERT_MESSAGE( - "Exception2a", (a >>= b) && b.member == 1 && b.member2 == 3); + "Exception2a", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "Exception2a", sal_Int32(1), b.member); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "Exception2a", sal_Int32(3), b.member2); } { Exception2b b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2, 2); - CPPUNIT_ASSERT_MESSAGE("Exception2b", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception2b", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception2b", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } } @@ -1913,102 +2300,129 @@ void Test::testInterface() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Interface2a>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > i(new Impl1); css::uno::Reference< Interface1 > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface1", i, b); } { css::uno::Reference< Interface2 > b(new Impl2); - CPPUNIT_ASSERT_MESSAGE("Interface2", (a >>= b) && b == i2); + CPPUNIT_ASSERT_MESSAGE("Interface2", (a >>= b)); + CPPUNIT_ASSERT_MESSAGE("Interface2", b.operator ==(i2)); } { css::uno::Reference< Interface2a > b(new Impl2); - CPPUNIT_ASSERT_MESSAGE("Interface2a", (a >>= b) && b == i2); + CPPUNIT_ASSERT_MESSAGE("Interface2a", (a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface2a", i2, b); } { css::uno::Reference< Interface2b > i(new Impl2b); css::uno::Reference< Interface2b > b(i); - CPPUNIT_ASSERT_MESSAGE("Interface2b", !(a >>= b) && b == i); + CPPUNIT_ASSERT_MESSAGE("Interface2b", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Interface2b", i, b); } { css::uno::Reference< Interface3 > b(new Impl2); - CPPUNIT_ASSERT_MESSAGE("Interface3", (a >>= b) && b == i2); + CPPUNIT_ASSERT_MESSAGE("Interface3", (a >>= b)); + CPPUNIT_ASSERT_MESSAGE("Interface3", b.operator ==(i2)); } } @@ -2017,104 +2431,135 @@ void Test::testNull() { CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Interface2a>::get())); { bool b = true; - CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("bool", b); } { sal_Bool b = true; - CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b) && b); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", !(a >>= b)); + CPPUNIT_ASSERT_MESSAGE("sal_Bool", b); } { sal_Int8 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int8", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int8", sal_Int8(2), b); } { sal_Int16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int16", sal_Int16(2), b); } { sal_uInt16 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt16", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt16", sal_uInt16(2), b); } { sal_Int32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int32", sal_Int32(2), b); } { sal_uInt32 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt32", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt32", sal_uInt32(2), b); } { sal_Int64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_Int64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Int64", sal_Int64(2), b); } { sal_uInt64 b = 2; - CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("sal_uInt64", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_uInt64", sal_uInt64(2), b); } { float b = 2; - CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("float", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("float", float(2), b); } { double b = 2; - CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b) && b == 2); + CPPUNIT_ASSERT_MESSAGE("double", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("double", 2.0, b); } { sal_Unicode b = '2'; - CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); + CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); CPPUNIT_ASSERT_MESSAGE( "css::uno::Type", - !(a >>= b) && b == cppu::UnoType<OUString>::get()); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Type", + cppu::UnoType<OUString>::get(), b); } { css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( "css::uno::Sequence<OUString>", - !(a >>= b) && b.getLength() == 2); + !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "css::uno::Sequence<OUString>", + sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; - CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b) && b == Enum1_M2); + CPPUNIT_ASSERT_MESSAGE("Enum1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Enum1", Enum1_M2, b); } { Struct1 b(2); - CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Struct1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Struct1", sal_Int32(2), b.member); } { Exception1 b( OUString(), css::uno::Reference< css::uno::XInterface >(), 2); - CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); + CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } { css::uno::Reference< Interface1 > b(new Impl1); CPPUNIT_ASSERT_MESSAGE( - "Interface1", (a >>= b) && !b.is()); + "Interface1", (a >>= b)); + CPPUNIT_ASSERT_MESSAGE( + "Interface1", !b.is()); } { css::uno::Reference< Interface2 > b(new Impl2); CPPUNIT_ASSERT_MESSAGE( - "Interface2", (a >>= b) && !b.is()); + "Interface2", (a >>= b)); + CPPUNIT_ASSERT_MESSAGE( + "Interface2", !b.is()); } { css::uno::Reference< Interface2a > b(new Impl2); - CPPUNIT_ASSERT_MESSAGE("Interface2a", (a >>= b) && !b.is()); + CPPUNIT_ASSERT_MESSAGE("Interface2a", (a >>= b)); + CPPUNIT_ASSERT_MESSAGE("Interface2a", !b.is()); } { css::uno::Reference< Interface2b > b(new Impl2b); CPPUNIT_ASSERT_MESSAGE( - "Interface2b", (a >>= b) && !b.is()); + "Interface2b", (a >>= b)); + CPPUNIT_ASSERT_MESSAGE( + "Interface2b", !b.is()); } { css::uno::Reference< Interface3 > b(new Impl2); CPPUNIT_ASSERT_MESSAGE( - "Interface3", (a >>= b) && !b.is()); + "Interface3", (a >>= b)); + CPPUNIT_ASSERT_MESSAGE( + "Interface3", !b.is()); } } diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 7a52bee8c6fa..71ce50b5d301 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -1169,15 +1169,22 @@ namespace { // separator doesn't have any other attribs if ( aType.get().data() == "separator" ) { - CPPUNIT_ASSERT( !aText && !aCommand && !aSubmenu && !aEnabled && !aChecktype && !aChecked ); + CPPUNIT_ASSERT( !aText ); + CPPUNIT_ASSERT( !aCommand ); + CPPUNIT_ASSERT( !aSubmenu ); + CPPUNIT_ASSERT( !aEnabled ); + CPPUNIT_ASSERT( !aChecktype ); + CPPUNIT_ASSERT( !aChecked ); } else if ( aType.get().data() == "command" ) { - CPPUNIT_ASSERT( aCommand && aText ); + CPPUNIT_ASSERT( aCommand ); + CPPUNIT_ASSERT( aText ); } else if ( aType.get().data() == "menu") { - CPPUNIT_ASSERT( aSubmenu && aText ); + CPPUNIT_ASSERT( aSubmenu ); + CPPUNIT_ASSERT( aText ); verifyContextMenuStructure( aSubmenu.get() ); } @@ -1187,8 +1194,8 @@ namespace { aChecktype.get().data() == "checkmark" || aChecktype.get().data() == "auto" ); - CPPUNIT_ASSERT( aChecked && - ( aChecked.get().data() == "true" || aChecked.get().data() == "false" ) ); + CPPUNIT_ASSERT( aChecked ); + CPPUNIT_ASSERT( aChecked.get().data() == "true" || aChecked.get().data() == "false" ); } } diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 32136c944091..57fb3b1cb768 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -984,7 +984,8 @@ void Test::testBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 8, static_cast<int>(aAttrs2[2].mnStart) ); CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(aAttrs2[2].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs2[2].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs2[2]) && hasItalic(aAttrs2[2]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs2[2]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs2[2]) ); CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(aAttrs2[3].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(aAttrs2[3].mnStart) ); @@ -1030,7 +1031,8 @@ void Test::testBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 8, static_cast<int>(aAttrs3[2].mnStart) ); CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(aAttrs3[2].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs3[2].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[2]) && hasItalic(aAttrs3[2]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[2]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs3[2]) ); CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(aAttrs3[3].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(aAttrs3[3].mnStart) ); @@ -1053,7 +1055,8 @@ void Test::testBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 27, static_cast<int>(aAttrs3[6].mnStart) ); CPPUNIT_ASSERT_EQUAL( 33, static_cast<int>(aAttrs3[6].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs3[6].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[6]) && hasItalic(aAttrs3[6]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[6]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs3[6]) ); CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(aAttrs3[7].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 33, static_cast<int>(aAttrs3[7].mnStart) ); @@ -1331,7 +1334,8 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(aAttrs2[2].mnStart) ); CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(aAttrs2[2].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs2[2].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs2[2]) && hasItalic(aAttrs2[2]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs2[2]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs2[2]) ); CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(aAttrs2[3].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(aAttrs2[3].mnStart) ); @@ -1349,7 +1353,8 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(aAttrs2[5].mnStart) ); CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(aAttrs2[5].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs2[5].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs2[5]) && hasItalic(aAttrs2[5]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs2[5]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs2[5]) ); CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(aAttrs2[6].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(aAttrs2[6].mnStart) ); @@ -1404,7 +1409,8 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(aAttrs3[2].mnStart) ); CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(aAttrs3[2].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs3[2].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[2]) && hasItalic(aAttrs3[2]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[2]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs3[2]) ); CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(aAttrs3[3].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(aAttrs3[3].mnStart) ); @@ -1422,7 +1428,8 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(aAttrs3[5].mnStart) ); CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(aAttrs3[5].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs3[5].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[5]) && hasItalic(aAttrs3[5]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[5]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs3[5]) ); CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(aAttrs3[6].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(aAttrs3[6].mnStart) ); @@ -1450,7 +1457,8 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 29, static_cast<int>(aAttrs3[10].mnStart) ); CPPUNIT_ASSERT_EQUAL( 33, static_cast<int>(aAttrs3[10].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs3[10].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[10]) && hasItalic(aAttrs3[10]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[10]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs3[10]) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs3[11].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 33, static_cast<int>(aAttrs3[11].mnStart) ); @@ -1468,7 +1476,8 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(aAttrs3[13].mnStart) ); CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(aAttrs3[13].mnEnd) ); CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aAttrs3[13].maAttributes.size()) ); - CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[13]) && hasItalic(aAttrs3[13]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(aAttrs3[13]) ); + CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasItalic(aAttrs3[13]) ); CPPUNIT_ASSERT_EQUAL( 3, static_cast<int>(aAttrs3[14].mnParagraph) ); CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(aAttrs3[14].mnStart) ); @@ -1560,7 +1569,8 @@ void Test::testSectionAttributes() CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(aAttrs[1].mnStart)); CPPUNIT_ASSERT_EQUAL(6, static_cast<int>(aAttrs[1].mnEnd)); CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(aAttrs[1].maAttributes.size())); - CPPUNIT_ASSERT_MESSAGE("This section must be bold and italic.", hasBold(aAttrs[1]) && hasItalic(aAttrs[1])); + CPPUNIT_ASSERT_MESSAGE("This section must be bold and italic.", hasBold(aAttrs[1])); + CPPUNIT_ASSERT_MESSAGE("This section must be bold and italic.", hasItalic(aAttrs[1])); // Third section should be 6-9, and it should be only italic. CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(aAttrs[2].mnParagraph)); diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 7cfa6277786e..bd6f1b27bf22 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -657,14 +657,21 @@ void TestLanguageTag::testAllTags() // test static isValidBcp47() method { OUString aCanonicalized; - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) && aCanonicalized == "en-US" ); - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized) && aCanonicalized == "x-foobar" ); - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized) && aCanonicalized == "qaa" ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) ); + CPPUNIT_ASSERT_EQUAL( OUString("en-US"), aCanonicalized ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized) ); + CPPUNIT_ASSERT_EQUAL( OUString("x-foobar"), aCanonicalized ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized) ); + CPPUNIT_ASSERT_EQUAL( OUString("qaa"), aCanonicalized ); CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "unreg-and-bad", &aCanonicalized) ); - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized, true) && aCanonicalized == "en-US" ); - CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized, true) && aCanonicalized == "x-foobar" ); - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized, true) && aCanonicalized == "qaa" ); - CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized, true) ); + CPPUNIT_ASSERT_EQUAL( OUString("en-US"), aCanonicalized ); + CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized, true) ); + CPPUNIT_ASSERT_EQUAL( OUString("x-foobar"), aCanonicalized ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized, true) ); + CPPUNIT_ASSERT_EQUAL( OUString("qaa"), aCanonicalized ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) ); + CPPUNIT_ASSERT_EQUAL( OUString("de-DE"), aCanonicalized ); /* TODO: at least some (those we know) grandfathered tags should be * recognized by the replacement code. */ CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-GB-oed", &aCanonicalized) ); diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 2e7dde17e937..91b9a0acbe03 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -181,28 +181,33 @@ void TestBreakIterator::testWordBoundaries() CPPUNIT_ASSERT(!m_xBreak->isBeginWord(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD)); CPPUNIT_ASSERT(m_xBreak->isEndWord(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD)); aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 4); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aBounds.endPos); CPPUNIT_ASSERT(!m_xBreak->isBeginWord(aTest, 8, aLocale, i18n::WordType::DICTIONARY_WORD)); CPPUNIT_ASSERT(!m_xBreak->isEndWord(aTest, 8, aLocale, i18n::WordType::DICTIONARY_WORD)); //next word aBounds = m_xBreak->getWordBoundary(aTest, 8, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 9 && aBounds.endPos == 12); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(12), aBounds.endPos); //previous word aBounds = m_xBreak->getWordBoundary(aTest, 8, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 5 && aBounds.endPos == 7); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.endPos); CPPUNIT_ASSERT(!m_xBreak->isBeginWord(aTest, 12, aLocale, i18n::WordType::DICTIONARY_WORD)); CPPUNIT_ASSERT(m_xBreak->isEndWord(aTest, 12, aLocale, i18n::WordType::DICTIONARY_WORD)); aBounds = m_xBreak->getWordBoundary(aTest, 12, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 9 && aBounds.endPos == 12); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(12), aBounds.endPos); CPPUNIT_ASSERT(m_xBreak->isBeginWord(aTest, 16, aLocale, i18n::WordType::DICTIONARY_WORD)); CPPUNIT_ASSERT(!m_xBreak->isEndWord(aTest, 16, aLocale, i18n::WordType::DICTIONARY_WORD)); aBounds = m_xBreak->getWordBoundary(aTest, 16, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 16 && aBounds.endPos == 19); + CPPUNIT_ASSERT_EQUAL(sal_Int32(16), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(19), aBounds.endPos); } //See https://bz.apache.org/ooo/show_bug.cgi?id=21907 @@ -235,25 +240,32 @@ void TestBreakIterator::testWordBoundaries() "Spanish"; aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 7); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.endPos); aBounds = m_xBreak->getWordBoundary(aTest, 12, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 9 && aBounds.endPos == 14); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(14), aBounds.endPos); aBounds = m_xBreak->getWordBoundary(aTest, 40, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 37 && aBounds.endPos == 44); + CPPUNIT_ASSERT_EQUAL(sal_Int32(37), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(44), aBounds.endPos); aBounds = m_xBreak->getWordBoundary(aTest, 49, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 46 && aBounds.endPos == 52); + CPPUNIT_ASSERT_EQUAL(sal_Int32(46), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(52), aBounds.endPos); aBounds = m_xBreak->getWordBoundary(aTest, 58, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 55 && aBounds.endPos == 62); + CPPUNIT_ASSERT_EQUAL(sal_Int32(55), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(62), aBounds.endPos); aBounds = m_xBreak->getWordBoundary(aTest, 67, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 64 && aBounds.endPos == 71); + CPPUNIT_ASSERT_EQUAL(sal_Int32(64), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(71), aBounds.endPos); aBounds = m_xBreak->getWordBoundary(aTest, 90, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 88 && aBounds.endPos == 92); + CPPUNIT_ASSERT_EQUAL(sal_Int32(88), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(92), aBounds.endPos); } //See https://bugs.libreoffice.org/show_bug.cgi?id=49629 @@ -274,16 +286,20 @@ void TestBreakIterator::testWordBoundaries() switch (mode) { case i18n::WordType::ANY_WORD: - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 4); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aBounds.endPos); break; case i18n::WordType::ANYWORD_IGNOREWHITESPACES: - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 4); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aBounds.endPos); break; case i18n::WordType::DICTIONARY_WORD: - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 4); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aBounds.endPos); break; case i18n::WordType::WORD_COUNT: - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 4); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aBounds.endPos); break; } @@ -303,16 +319,20 @@ void TestBreakIterator::testWordBoundaries() switch (mode) { case i18n::WordType::ANY_WORD: - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 9); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos); break; case i18n::WordType::ANYWORD_IGNOREWHITESPACES: - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 9); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos); break; case i18n::WordType::DICTIONARY_WORD: - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 9); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos); break; case i18n::WordType::WORD_COUNT: - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 9); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos); break; } @@ -562,10 +582,12 @@ void TestBreakIterator::testWordBoundaries() u"ru\uFB00le \uFB01sh"; aBounds = m_xBreak->getWordBoundary(aTest, 1, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 5); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos); aBounds = m_xBreak->getWordBoundary(aTest, 7, aLocale, i18n::WordType::DICTIONARY_WORD, false); - CPPUNIT_ASSERT(aBounds.startPos == 6 && aBounds.endPos == 9); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos); } //See https://bz.apache.org/ooo/show_bug.cgi?id=113785 @@ -577,13 +599,16 @@ void TestBreakIterator::testWordBoundaries() u"a\u2013b\u2014c"; aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 1); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aBounds.endPos); aBounds = m_xBreak->nextWord(aTest, 0, aLocale, i18n::WordType::DICTIONARY_WORD); - CPPUNIT_ASSERT(aBounds.startPos == 2 && aBounds.endPos == 3); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.endPos); aBounds = m_xBreak->nextWord(aTest, aBounds.endPos, aLocale, i18n::WordType::DICTIONARY_WORD); - CPPUNIT_ASSERT(aBounds.startPos == 4 && aBounds.endPos == 5); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos); } } @@ -852,8 +877,10 @@ void TestBreakIterator::testThai() static constexpr OUStringLiteral aTest = u"\u0E01\u0E38\u0E2B\u0E25\u0E32\u0E1A"; i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT_MESSAGE("Should skip full word", - aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should skip full word", + sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should skip full word", + aTest.getLength(), aBounds.endPos); } //See https://bz.apache.org/ooo/show_bug.cgi?id=29548 @@ -968,7 +995,8 @@ void TestBreakIterator::doTestJapanese(uno::Reference< i18n::XBreakIterator > co aBounds = xBreak->getWordBoundary(aTest, 5, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 7); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.endPos); } { @@ -977,12 +1005,14 @@ void TestBreakIterator::doTestJapanese(uno::Reference< i18n::XBreakIterator > co aBounds = xBreak->getWordBoundary(aTest, 1, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 3); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.endPos); aBounds = xBreak->getWordBoundary(aTest, 5, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 3 && aBounds.endPos == 6); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aBounds.endPos); } } @@ -1008,7 +1038,8 @@ void TestBreakIterator::testChinese() i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD, true); - CPPUNIT_ASSERT(aBounds.startPos == 4 && aBounds.endPos == 6); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aBounds.startPos); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aBounds.endPos); } } void TestBreakIterator::setUp() diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx index e2ea659eaccb..846477d615f1 100644 --- a/i18npool/qa/cppunit/test_characterclassification.cxx +++ b/i18npool/qa/cppunit/test_characterclassification.cxx @@ -8,6 +8,7 @@ */ #include <com/sun/star/i18n/XCharacterClassification.hpp> +#include <o3tl/cppunittraitshelper.hxx> #include <unotest/bootstrapfixturebase.hxx> using namespace ::com::sun::star; @@ -53,11 +54,14 @@ void TestCharacterClassification::testTitleCase() //tricky one static constexpr OUStringLiteral aTest = u"\u01F3"; // LATIN SMALL LETTER DZ OUString sTitleCase = m_xCC->toTitle(aTest, 0, aTest.getLength(), aLocale); - CPPUNIT_ASSERT_MESSAGE("Should be title", sTitleCase.getLength() == 1 && sTitleCase[0] == 0x01F2); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", sal_Int32(1), sTitleCase.getLength()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be title", u'\u01F2', sTitleCase[0]); OUString sUpperCase = m_xCC->toUpper(aTest, 0, aTest.getLength(), aLocale); - CPPUNIT_ASSERT_MESSAGE("Should be upper", sUpperCase.getLength() == 1 && sUpperCase[0] == 0x01F1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", sal_Int32(1), sUpperCase.getLength()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be upper", u'\u01F1', sUpperCase[0]); OUString sLowerCase = m_xCC->toLower(aTest, 0, aTest.getLength(), aLocale); - CPPUNIT_ASSERT_MESSAGE("Should be lower ", sLowerCase.getLength() == 1 && sLowerCase[0] == 0x01F3); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower ", sal_Int32(1), sLowerCase.getLength()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be lower ", u'\u01F3', sLowerCase[0]); } } diff --git a/i18npool/qa/cppunit/test_textsearch.cxx b/i18npool/qa/cppunit/test_textsearch.cxx index 51e6a11bfc83..31c66d94cd8d 100644 --- a/i18npool/qa/cppunit/test_textsearch.cxx +++ b/i18npool/qa/cppunit/test_textsearch.cxx @@ -124,9 +124,12 @@ void TestTextSearch::testSearches() m_xSearch->setOptions(aOptions); aRes = m_xSearch->searchForward("11 22 33", 2, 7); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 2) && (aRes.endOffset[0] == 5)); - CPPUNIT_ASSERT((aRes.startOffset[1] == 2) && (aRes.endOffset[1] == 2)); - CPPUNIT_ASSERT((aRes.startOffset[2] == 3) && (aRes.endOffset[2] == 5)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aRes.endOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aRes.startOffset[1]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aRes.endOffset[1]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aRes.startOffset[2]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aRes.endOffset[2]); } void TestTextSearch::testWildcardSearch() @@ -147,44 +150,52 @@ void TestTextSearch::testWildcardSearch() // match first "a", [0,1) aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 0) && (aRes.endOffset[0] == 1)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRes.endOffset[0]); // match last "a", (5,4] aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 5) && (aRes.endOffset[0] == 4)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aRes.endOffset[0]); aOptions.searchString = "a?"; m_xSearch2->setOptions2( aOptions ); // match "ab", [0,2) aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 0) && (aRes.endOffset[0] == 2)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aRes.endOffset[0]); // match "ac", (4,2] aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 4) && (aRes.endOffset[0] == 2)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aRes.endOffset[0]); aOptions.searchString = "a*c"; m_xSearch2->setOptions2( aOptions ); // match "abac", [0,4) XXX NOTE: first match forward aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 0) && (aRes.endOffset[0] == 4)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aRes.endOffset[0]); // match "ac", (4,2] XXX NOTE: first match backward, not greedy aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 4) && (aRes.endOffset[0] == 2)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aRes.endOffset[0]); aOptions.searchString = "b*a"; m_xSearch2->setOptions2( aOptions ); // match "ba", [1,3) XXX NOTE: first match forward, not greedy aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 1) && (aRes.endOffset[0] == 3)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aRes.endOffset[0]); // match "baca", (5,1] XXX NOTE: first match backward aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 5) && (aRes.endOffset[0] == 1)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRes.endOffset[0]); aText = "ab?ca"; @@ -193,11 +204,13 @@ void TestTextSearch::testWildcardSearch() // match "b?c", [1,4) aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 1) && (aRes.endOffset[0] == 4)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aRes.endOffset[0]); // match "b?c", (4,1] aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 4) && (aRes.endOffset[0] == 1)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRes.endOffset[0]); aText = "ab*ca"; @@ -206,11 +219,13 @@ void TestTextSearch::testWildcardSearch() // match "b?c", [1,4) aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 1) && (aRes.endOffset[0] == 4)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aRes.endOffset[0]); // match "b?c", (4,1] aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 4) && (aRes.endOffset[0] == 1)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aRes.endOffset[0]); aOptions.searchString = "ca?"; m_xSearch2->setOptions2( aOptions ); @@ -226,22 +241,26 @@ void TestTextSearch::testWildcardSearch() // match "ca", [3,5) aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 3) && (aRes.endOffset[0] == 5)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aRes.endOffset[0]); // match "ca", (5,3] aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 5) && (aRes.endOffset[0] == 3)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aRes.endOffset[0]); aOptions.searchString = "*ca*"; m_xSearch2->setOptions2( aOptions ); // match "abaca", [0,5) aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 0) && (aRes.endOffset[0] == 5)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aRes.endOffset[0]); // match "abaca", (5,0] aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 5) && (aRes.endOffset[0] == 0)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.endOffset[0]); aText = "123123"; aOptions.searchString = "*2?"; @@ -249,22 +268,26 @@ void TestTextSearch::testWildcardSearch() // match first "123", [0,3) aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 0) && (aRes.endOffset[0] == 3)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aRes.endOffset[0]); // match "123123", (6,0] Yes this looks odd, but it is as searching "?2*" forward. aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 6) && (aRes.endOffset[0] == 0)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.endOffset[0]); aOptions.searchFlag |= util::SearchFlags::WILD_MATCH_SELECTION; m_xSearch2->setOptions2( aOptions ); // match "123123", [0,6) with greedy '*' aRes = m_xSearch2->searchForward( aText, 0, aText.getLength()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 0) && (aRes.endOffset[0] == 6)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aRes.endOffset[0]); // match "123123", (6,0] aRes = m_xSearch2->searchBackward( aText, aText.getLength(), 0); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aRes.subRegExpressions); - CPPUNIT_ASSERT((aRes.startOffset[0] == 6) && (aRes.endOffset[0] == 0)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aRes.startOffset[0]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aRes.endOffset[0]); } void TestTextSearch::testApostropheSearch() diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index cfc73ca42dfb..5b55d8a49936 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -241,8 +241,17 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "two empty strings(with an argu)", - lastRes && ( aStrBuf2.getCapacity() == 0 ) && - ( *(aStrBuf2.getStr()) == '\0' ) + lastRes + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "two empty strings(with an argu)", + sal_Int32(0), aStrBuf2.getCapacity() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "two empty strings(with an argu)", + '\0', *(aStrBuf2.getStr()) ); } @@ -257,8 +266,17 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "normal string", - lastRes && ( aStrBuf3.getCapacity() == 0 ) && - ( *(aStrBuf3.getStr()) == '\0' ) + lastRes + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "normal string", + sal_Int32(0), aStrBuf3.getCapacity() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "normal string", + '\0', *(aStrBuf3.getStr()) ); } @@ -273,8 +291,17 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "string with space ", - lastRes && ( aStrBuf4.getCapacity() == 0 ) && - ( *(aStrBuf4.getStr()) == '\0' ) + lastRes + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "string with space ", + sal_Int32(0), aStrBuf4.getCapacity() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "string with space ", + '\0', *(aStrBuf4.getStr()) ); } @@ -288,8 +315,17 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "empty string", - lastRes && ( aStrBuf5.getCapacity() == 0 ) && - ( *(aStrBuf5.getStr()) == '\0' ) + lastRes + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "empty string", + sal_Int32(0), aStrBuf5.getCapacity() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "empty string", + '\0', *(aStrBuf5.getStr()) ); } @@ -303,8 +339,17 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "string with a character", - lastRes && ( aStrBuf6.getCapacity() == 0 ) && - ( *(aStrBuf6.getStr()) == '\0' ) + lastRes + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "string with a character", + sal_Int32(0), aStrBuf6.getCapacity() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "string with a character", + '\0', *(aStrBuf6.getStr()) ); } @@ -318,8 +363,17 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "string with special characters", - lastRes && ( aStrBuf7.getCapacity() == 0 ) && - ( *(aStrBuf7.getStr()) == '\0' ) + lastRes + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "string with special characters", + sal_Int32(0), aStrBuf7.getCapacity() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "string with special characters", + '\0', *(aStrBuf7.getStr()) ); } @@ -333,8 +387,17 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "string only with (\0)", - lastRes && ( aStrBuf8.getCapacity() == 0 ) && - ( *(aStrBuf8.getStr()) == '\0' ) + lastRes + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "string only with (\0)", + sal_Int32(0), aStrBuf8.getCapacity() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "string only with (\0)", + '\0', *(aStrBuf8.getStr()) ); } @@ -899,12 +962,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the capacity of OStringBuffer(kTestStr1)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer(kTestStr1)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer(kTestStr1)", + expVal3, aStrBuf.getCapacity() ); } @@ -919,12 +990,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer(kTestStr1)", + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer(kTestStr1)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the length of OStringBuffer(kTestStr1)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -939,12 +1018,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to the length of OStringBuffer(kTestStr1)", + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to the length of OStringBuffer(kTestStr1)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength equal to the length of OStringBuffer(kTestStr1)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -959,12 +1046,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OStringBuffer(kTestStr1)", + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength less than the length of OStringBuffer(kTestStr1)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OStringBuffer(kTestStr1)", + expVal3, aStrBuf.getCapacity() ); } @@ -978,12 +1073,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength equal to 0", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to 0", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to 0", + expVal3, aStrBuf.getCapacity() ); } @@ -998,12 +1101,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the capacity of OStringBuffer(1)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer(1)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer(1)", + expVal3, aStrBuf.getCapacity() ); } @@ -1018,12 +1129,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to the length of OStringBuffer(1)", + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength equal to the length of OStringBuffer(1)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to the length of OStringBuffer(1)", + expVal3, aStrBuf.getCapacity() ); } @@ -1037,12 +1156,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength less than the length of OUStringBuffer(1)", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OUStringBuffer(1)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OUStringBuffer(1)", + expVal3, aStrBuf.getCapacity() ); } @@ -1056,12 +1183,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer()", + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the capacity of OStringBuffer()", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer()", + expVal3, aStrBuf.getCapacity() ); } @@ -1075,12 +1210,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer()", + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer()", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the length of OStringBuffer()", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -1094,12 +1237,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the length of OStringBuffer()", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer()", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer()", + expVal3, aStrBuf.getCapacity() ); } @@ -1113,12 +1264,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer("")", + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the capacity of OStringBuffer("")", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer("")", + expVal3, aStrBuf.getCapacity() ); } @@ -1132,12 +1291,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer("")", + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer("")", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the length of OStringBuffer("")", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -1151,12 +1318,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OStringBuffer("")", + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OStringBuffer("")", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength less than the length of OStringBuffer("")", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -1170,12 +1345,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the length of OStringBuffer(\0)", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer(\0)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer(\0)", + expVal3, aStrBuf.getCapacity() ); } @@ -1189,12 +1372,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the length of OStringBuffer(\0)", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer(\0)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer(\0)", + expVal3, aStrBuf.getCapacity() ); } @@ -1208,12 +1399,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OStringBuffer(\0)", + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OStringBuffer(\0)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength less than the length of OStringBuffer(\0)", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -1228,12 +1427,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the capacity of OStringBuffer(kTestStr2)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer(kTestStr2)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the capacity of OStringBuffer(kTestStr2)", + expVal3, aStrBuf.getCapacity() ); } @@ -1248,12 +1455,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength more than the length of OStringBuffer(kTestStr2)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer(kTestStr2)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength more than the length of OStringBuffer(kTestStr2)", + expVal3, aStrBuf.getCapacity() ); } @@ -1268,12 +1483,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to the length of OUStringBuffer(kTestStr2)", + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to the length of OUStringBuffer(kTestStr2)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength equal to the length of OUStringBuffer(kTestStr2)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -1288,12 +1511,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OUStringBuffer(TestStr2)", + expVal2, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength less than the length of OUStringBuffer(TestStr2)", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength less than the length of OUStringBuffer(TestStr2)", - aStrBuf.getStr() == expVal2 && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -1307,12 +1538,20 @@ namespace rtl_OStringBuffer aStrBuf.setLength( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to 0", + '\0', aStrBuf.getStr()[0] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "newLength equal to 0", + expVal1, aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "newLength equal to 0", - aStrBuf.getStr()[0] == '\0' && - aStrBuf.getLength() == expVal1 && - aStrBuf.getCapacity() == expVal3 + expVal3, aStrBuf.getCapacity() ); } @@ -1413,8 +1652,12 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "test empty string", - pstr != nullptr && - pstr[0] == '\0' + pstr != nullptr + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "test empty string", + '\0', pstr[0] ); } @@ -1450,10 +1693,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1466,11 +1714,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1483,11 +1735,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1499,11 +1755,15 @@ namespace rtl_OStringBuffer aStrBuf.append( empty ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1516,11 +1776,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1533,11 +1797,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1550,11 +1818,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1566,11 +1838,15 @@ namespace rtl_OStringBuffer aStrBuf.append( empty ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1583,11 +1859,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1600,11 +1880,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1617,11 +1901,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1633,11 +1921,15 @@ namespace rtl_OStringBuffer aStrBuf.append( empty ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1650,11 +1942,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1667,11 +1963,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1684,11 +1984,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1700,11 +2004,15 @@ namespace rtl_OStringBuffer aStrBuf.append( empty ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1717,11 +2025,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1734,11 +2046,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1751,11 +2067,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -1767,11 +2087,15 @@ namespace rtl_OStringBuffer aStrBuf.append( empty ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1786,14 +2110,25 @@ namespace rtl_OStringBuffer aStrBuf.append("hello world"); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "should be able to append nulls", + sal_Int32(2 * RTL_CONSTASCII_LENGTH("hello world") + 3), aStrBuf.getLength() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "should be able to append nulls", - aStrBuf.getLength() == - 2 * RTL_CONSTASCII_LENGTH("hello world") + 3 && - aStrBuf[RTL_CONSTASCII_LENGTH("hello world")] == 0 && - aStrBuf[RTL_CONSTASCII_LENGTH("hello world")]+1 == 1 && - aStrBuf[RTL_CONSTASCII_LENGTH("hello world")]+2 == 2 + '\0', aStrBuf[RTL_CONSTASCII_LENGTH("hello world")] + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "should be able to append nulls", + 1, aStrBuf[RTL_CONSTASCII_LENGTH("hello world")]+1 + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "should be able to append nulls", + 2, aStrBuf[RTL_CONSTASCII_LENGTH("hello world")]+2 ); } @@ -1846,10 +2181,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1862,10 +2202,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1878,10 +2223,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1894,10 +2244,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1910,10 +2265,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1926,10 +2286,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1942,10 +2307,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1958,10 +2328,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1974,10 +2349,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -1990,10 +2370,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2006,10 +2391,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2022,10 +2412,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2038,10 +2433,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2054,10 +2454,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2070,10 +2475,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2086,10 +2496,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2102,10 +2517,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2118,10 +2538,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2134,10 +2559,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2150,10 +2580,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2227,10 +2662,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2244,10 +2684,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2261,10 +2706,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2278,10 +2728,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2295,10 +2750,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2312,10 +2772,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2329,10 +2794,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2346,10 +2816,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2363,10 +2838,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2380,10 +2860,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2397,10 +2882,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2414,10 +2904,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2431,10 +2926,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2448,10 +2948,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2465,10 +2970,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2482,10 +2992,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2499,10 +3014,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length less than 16) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length less than 16) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2516,10 +3036,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length more than 16) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length more than 16) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2533,10 +3058,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 16) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 16) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2550,10 +3080,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input1, input2 ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the string(length equal to 0) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the string(length equal to 0) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2605,10 +3140,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_True) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_True) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2621,10 +3161,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_False) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_False) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2637,10 +3182,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_True) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_True) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2653,10 +3203,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_False) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_False) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2669,10 +3224,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_True) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_True) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2685,10 +3245,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_False) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_False) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2701,10 +3266,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_True) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_True) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2717,10 +3287,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_False) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_False) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2733,10 +3308,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_True) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_True) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2749,10 +3329,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Bool(sal_False) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Bool(sal_False) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2834,10 +3419,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(M) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(M) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2850,10 +3440,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the sal_Unicode(kSInt8Max) to the string buffer arrOUS[0]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the sal_Unicode(kSInt8Max) to the string buffer arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2866,10 +3461,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(s) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(s) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2882,10 +3482,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(kSInt8Max) to the string buffer arrOUS[1]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(kSInt8Max) to the string buffer arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2898,10 +3503,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(s) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(s) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2914,10 +3524,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(kSInt8Max) to the string buffer arrOUS[2]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(kSInt8Max) to the string buffer arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2930,10 +3545,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(s) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(s) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2946,10 +3566,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(kSInt8Max) to the string buffer arrOUS[3]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(kSInt8Max) to the string buffer arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2962,10 +3587,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(s) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(s) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -2978,10 +3608,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Appends the char(kSInt8Max) to the string buffer arrOUS[4]", - ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "Appends the char(kSInt8Max) to the string buffer arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3063,11 +3698,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3082,11 +3721,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3101,11 +3744,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3120,11 +3767,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3139,11 +3790,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3158,11 +3813,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3177,11 +3836,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3196,11 +3859,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3215,11 +3882,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3234,11 +3905,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3253,11 +3928,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3272,11 +3951,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3291,11 +3974,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3310,11 +3997,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3329,11 +4020,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3348,11 +4043,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3367,11 +4066,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3386,11 +4089,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3405,11 +4112,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3424,11 +4135,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3443,11 +4158,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3462,11 +4181,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3481,11 +4204,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3500,11 +4227,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3519,11 +4250,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3538,11 +4273,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3557,11 +4296,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3576,11 +4319,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3595,11 +4342,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3614,11 +4365,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3633,11 +4388,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3652,11 +4411,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3671,11 +4434,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3690,11 +4457,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3709,11 +4480,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3728,11 +4503,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3747,11 +4526,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3766,11 +4549,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3785,11 +4572,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3804,11 +4595,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3823,11 +4618,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3842,11 +4641,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3861,11 +4664,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3880,11 +4687,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3899,11 +4710,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3918,11 +4733,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3937,11 +4756,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -3956,11 +4779,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3975,11 +4802,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -3994,11 +4825,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4013,11 +4848,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4032,11 +4871,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4051,11 +4894,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4070,11 +4917,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4089,11 +4940,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4108,11 +4963,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4127,11 +4986,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4146,11 +5009,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4165,11 +5032,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4184,11 +5055,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4203,11 +5078,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4222,11 +5101,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4241,11 +5124,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4260,11 +5147,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4279,11 +5170,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4298,11 +5193,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4317,11 +5216,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4336,11 +5239,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4355,11 +5262,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4374,11 +5285,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4393,11 +5308,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4412,11 +5331,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4431,11 +5354,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4450,11 +5377,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4469,11 +5400,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4488,11 +5423,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4507,11 +5446,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4526,11 +5469,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4545,11 +5492,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4564,11 +5515,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4583,11 +5538,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4602,11 +5561,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4621,11 +5584,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4640,11 +5607,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4659,11 +5630,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4678,11 +5653,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4697,11 +5676,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4716,11 +5699,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4735,11 +5722,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4754,11 +5745,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4773,11 +5768,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4792,11 +5791,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_kRadixDecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4811,11 +5814,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4830,11 +5837,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4849,11 +5860,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4868,11 +5883,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4887,11 +5906,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -4906,11 +5929,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4925,11 +5952,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -4944,11 +5975,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5042,11 +6077,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5061,11 +6100,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5080,11 +6123,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5099,11 +6146,15 @@ namespace rtl_OStringBuffer expVal += OString( "17777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5118,11 +6169,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5137,11 +6192,15 @@ namespace rtl_OStringBuffer expVal += OString( "2147483647" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5156,11 +6215,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5175,11 +6238,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5194,11 +6261,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5213,11 +6284,15 @@ namespace rtl_OStringBuffer expVal += OString( "zik0zj" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5232,11 +6307,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5251,11 +6330,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5270,11 +6353,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5289,11 +6376,15 @@ namespace rtl_OStringBuffer expVal += OString( "17777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5308,11 +6399,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5327,11 +6422,15 @@ namespace rtl_OStringBuffer expVal += OString( "2147483647" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5346,11 +6445,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5365,11 +6468,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5384,11 +6491,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5403,11 +6514,15 @@ namespace rtl_OStringBuffer expVal += OString( "zik0zj" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5422,11 +6537,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5441,11 +6560,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5460,11 +6583,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5479,11 +6606,15 @@ namespace rtl_OStringBuffer expVal += OString( "17777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5498,11 +6629,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5517,11 +6652,15 @@ namespace rtl_OStringBuffer expVal += OString( "2147483647" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5536,11 +6675,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5555,11 +6698,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5574,11 +6721,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5593,11 +6744,15 @@ namespace rtl_OStringBuffer expVal += OString( "zik0zj" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5612,11 +6767,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5631,11 +6790,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5650,11 +6813,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5669,11 +6836,15 @@ namespace rtl_OStringBuffer expVal += OString( "17777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5688,11 +6859,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5707,11 +6882,15 @@ namespace rtl_OStringBuffer expVal += OString( "2147483647" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5726,11 +6905,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5745,11 +6928,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5764,11 +6951,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5783,11 +6974,15 @@ namespace rtl_OStringBuffer expVal += OString( "zik0zj" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5802,11 +6997,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5821,11 +7020,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5840,11 +7043,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5859,11 +7066,15 @@ namespace rtl_OStringBuffer expVal += OString( "17777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5878,11 +7089,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5897,11 +7112,15 @@ namespace rtl_OStringBuffer expVal += OString( "2147483647" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5916,11 +7135,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5935,11 +7158,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -5954,11 +7181,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -5973,11 +7204,15 @@ namespace rtl_OStringBuffer expVal += OString( "zik0zj" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6046,11 +7281,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6066,11 +7305,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6086,11 +7329,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6106,11 +7353,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6125,11 +7376,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6145,11 +7400,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6165,11 +7424,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6185,11 +7448,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6204,11 +7471,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6224,11 +7495,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6244,11 +7519,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6264,11 +7543,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6283,11 +7566,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6303,11 +7590,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6323,11 +7614,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6343,11 +7638,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6362,11 +7661,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6382,11 +7685,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6402,11 +7709,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6422,11 +7733,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6441,11 +7756,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6461,11 +7780,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6481,11 +7804,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6501,11 +7828,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6520,11 +7851,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6540,11 +7875,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6560,11 +7899,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6580,11 +7923,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6599,11 +7946,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6619,11 +7970,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6639,11 +7994,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6659,11 +8018,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6678,11 +8041,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6698,11 +8065,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6718,11 +8089,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6738,11 +8113,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6757,11 +8136,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6777,11 +8160,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6797,11 +8184,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6817,11 +8208,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6836,11 +8231,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6856,11 +8255,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6876,11 +8279,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6896,11 +8303,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6915,11 +8326,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6935,11 +8350,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -6955,11 +8374,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6975,11 +8398,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -6994,11 +8421,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7014,11 +8445,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7034,11 +8469,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7054,11 +8493,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7073,11 +8516,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7093,11 +8540,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7113,11 +8564,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7133,11 +8588,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7152,11 +8611,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7172,11 +8635,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7192,11 +8659,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7212,11 +8683,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7231,11 +8706,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7251,11 +8730,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7271,11 +8754,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7291,11 +8778,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7310,11 +8801,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7330,11 +8825,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7350,11 +8849,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7370,11 +8873,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7389,11 +8896,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7409,11 +8920,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7429,11 +8944,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7449,11 +8968,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7468,11 +8991,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7488,11 +9015,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7508,11 +9039,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7528,11 +9063,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7547,11 +9086,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7567,11 +9110,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7587,11 +9134,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7607,11 +9158,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7626,11 +9181,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7646,11 +9205,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7666,11 +9229,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7686,11 +9253,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 2)_006_negative_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7705,11 +9276,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7725,11 +9300,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7745,11 +9324,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7765,11 +9348,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 8)_006_negative_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7784,11 +9371,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7804,11 +9395,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7824,11 +9419,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7844,11 +9443,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7863,11 +9466,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7883,11 +9490,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7903,11 +9514,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7923,11 +9538,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -7942,11 +9561,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7962,11 +9585,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -7981,11 +9608,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8000,11 +9631,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int32, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8084,11 +9719,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 11 and return OStringBuffer[0]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 11 and return OStringBuffer[0]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8101,11 +9740,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 0 and return OStringBuffer[0]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 0 and return OStringBuffer[0]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8118,11 +9761,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -11 and return OStringBuffer[0]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -11 and return OStringBuffer[0]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8135,11 +9782,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 2147483647 and return OStringBuffer[0]+2147483647", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 2147483647 and return OStringBuffer[0]+2147483647", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8152,11 +9803,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -2147483648 and return OStringBuffer[0]+(-2147483648)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -2147483648 and return OStringBuffer[0]+(-2147483648)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8169,11 +9824,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 11 and return OStringBuffer[1]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 11 and return OStringBuffer[1]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8186,11 +9845,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 0 and return OStringBuffer[1]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 0 and return OStringBuffer[1]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8203,11 +9866,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -11 and return OStringBuffer[1]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -11 and return OStringBuffer[1]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8220,11 +9887,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 2147483647 and return OStringBuffer[1]+2147483647", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 2147483647 and return OStringBuffer[1]+2147483647", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8237,11 +9908,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -2147483648 and return OStringBuffer[1]+(-2147483648)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -2147483648 and return OStringBuffer[1]+(-2147483648)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8254,11 +9929,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 11 and return OStringBuffer[2]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 11 and return OStringBuffer[2]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8271,11 +9950,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 0 and return OUStringBuffer[2]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 0 and return OUStringBuffer[2]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8288,11 +9971,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -11 and return OUStringBuffer[2]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -11 and return OUStringBuffer[2]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8305,11 +9992,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 2147483647 and return OStringBuffer[2]+2147483647", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 2147483647 and return OStringBuffer[2]+2147483647", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8322,11 +10013,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -2147483648 and return OStringBuffer[2]+(-2147483648)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -2147483648 and return OStringBuffer[2]+(-2147483648)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8339,11 +10034,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 11 and return OStringBuffer[3]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 11 and return OStringBuffer[3]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8356,11 +10055,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 0 and return OStringBuffer[3]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 0 and return OStringBuffer[3]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8373,11 +10076,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -11 and return OStringBuffer[3]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -11 and return OStringBuffer[3]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8390,11 +10097,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 2147483647 and return OStringBuffer[3]+2147483647", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 2147483647 and return OStringBuffer[3]+2147483647", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8407,11 +10118,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -2147483648 and return OStringBuffer[3]+(-2147483648)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -2147483648 and return OStringBuffer[3]+(-2147483648)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8424,11 +10139,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 11 and return OStringBuffer[4]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 11 and return OStringBuffer[4]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8441,11 +10160,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 0 and return OStringBuffer[4]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 0 and return OStringBuffer[4]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8458,11 +10181,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -11 and return OStringBuffer[4]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -11 and return OStringBuffer[4]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8475,11 +10202,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 2147483647 and return OStringBuffer[4]+2147483647", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 2147483647 and return OStringBuffer[4]+2147483647", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8492,11 +10223,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int32 -2147483648 and return OStringBuffer[4]+(-2147483648)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int32 -2147483648 and return OStringBuffer[4]+(-2147483648)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8653,11 +10388,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8672,11 +10411,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8691,11 +10434,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8710,11 +10457,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8729,11 +10480,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8748,11 +10503,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8767,11 +10526,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8786,11 +10549,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8805,11 +10572,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8824,11 +10595,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8843,11 +10618,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8862,11 +10641,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8881,11 +10664,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8900,11 +10687,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -8919,11 +10710,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8938,11 +10733,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8957,11 +10756,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8976,11 +10779,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -8995,11 +10802,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9014,11 +10825,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9033,11 +10848,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9052,11 +10871,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9071,11 +10894,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9090,11 +10917,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9109,11 +10940,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9128,11 +10963,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9147,11 +10986,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9166,11 +11009,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9185,11 +11032,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9204,11 +11055,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9223,11 +11078,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9242,11 +11101,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9261,11 +11124,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9280,11 +11147,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9299,11 +11170,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9318,11 +11193,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9337,11 +11216,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9356,11 +11239,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9375,11 +11262,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9394,11 +11285,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9413,11 +11308,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9432,11 +11331,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9451,11 +11354,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9470,11 +11377,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9489,11 +11400,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9508,11 +11423,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9527,11 +11446,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9546,11 +11469,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9565,11 +11492,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9584,11 +11515,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9603,11 +11538,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9622,11 +11561,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9641,11 +11584,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9660,11 +11607,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9679,11 +11630,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9698,11 +11653,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9717,11 +11676,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9736,11 +11699,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9755,11 +11722,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9774,11 +11745,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9793,11 +11768,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9812,11 +11791,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9831,11 +11814,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9850,11 +11837,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9869,11 +11860,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9888,11 +11883,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9907,11 +11906,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9926,11 +11929,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9945,11 +11952,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -9964,11 +11975,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -9983,11 +11998,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10002,11 +12021,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10021,11 +12044,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10040,11 +12067,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10059,11 +12090,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10078,11 +12113,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10097,11 +12136,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10116,11 +12159,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10135,11 +12182,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10154,11 +12205,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10173,11 +12228,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10192,11 +12251,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10211,11 +12274,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10230,11 +12297,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10249,11 +12320,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10268,11 +12343,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10287,11 +12366,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10306,11 +12389,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10325,11 +12412,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10344,11 +12435,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10363,11 +12458,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10382,11 +12481,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10401,11 +12504,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10420,11 +12527,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10439,11 +12550,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10458,11 +12573,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10477,11 +12596,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10496,11 +12619,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10515,11 +12642,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10534,11 +12665,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10632,11 +12767,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10651,11 +12790,15 @@ namespace rtl_OStringBuffer expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10670,11 +12813,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10689,11 +12836,15 @@ namespace rtl_OStringBuffer expVal += OString( "777777777777777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10708,11 +12859,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10727,11 +12882,15 @@ namespace rtl_OStringBuffer expVal += OString( "9223372036854775807" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10746,11 +12905,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10765,11 +12928,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffffffffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10784,11 +12951,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10803,11 +12974,15 @@ namespace rtl_OStringBuffer expVal += OString( "1y2p0ij32e8e7" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10822,11 +12997,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10841,11 +13020,15 @@ namespace rtl_OStringBuffer expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10860,11 +13043,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10879,11 +13066,15 @@ namespace rtl_OStringBuffer expVal += OString( "777777777777777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10898,11 +13089,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10917,11 +13112,15 @@ namespace rtl_OStringBuffer expVal += OString( "9223372036854775807" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10936,11 +13135,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -10955,11 +13158,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffffffffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10974,11 +13181,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -10993,11 +13204,15 @@ namespace rtl_OStringBuffer expVal += OString( "1y2p0ij32e8e7" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11012,11 +13227,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11031,11 +13250,15 @@ namespace rtl_OStringBuffer expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11050,11 +13273,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11069,11 +13296,15 @@ namespace rtl_OStringBuffer expVal += OString( "777777777777777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11088,11 +13319,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11107,11 +13342,15 @@ namespace rtl_OStringBuffer expVal += OString( "9223372036854775807" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11126,11 +13365,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11145,11 +13388,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffffffffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11164,11 +13411,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11183,11 +13434,15 @@ namespace rtl_OStringBuffer expVal += OString( "1y2p0ij32e8e7" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11202,11 +13457,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11221,11 +13480,15 @@ namespace rtl_OStringBuffer expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11240,11 +13503,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11259,11 +13526,15 @@ namespace rtl_OStringBuffer expVal += OString( "777777777777777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11278,11 +13549,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11297,11 +13572,15 @@ namespace rtl_OStringBuffer expVal += OString( "9223372036854775807" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11316,11 +13595,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11335,11 +13618,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffffffffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11354,11 +13641,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11373,11 +13664,15 @@ namespace rtl_OStringBuffer expVal += OString( "1y2p0ij32e8e7" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11392,11 +13687,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11411,11 +13710,15 @@ namespace rtl_OStringBuffer expVal += OString( "111111111111111111111111111111111111111111111111111111111111111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11430,11 +13733,15 @@ namespace rtl_OStringBuffer expVal += OString( "177" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11449,11 +13756,15 @@ namespace rtl_OStringBuffer expVal += OString( "777777777777777777777" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11468,11 +13779,15 @@ namespace rtl_OStringBuffer expVal += OString( "127" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11487,11 +13802,15 @@ namespace rtl_OStringBuffer expVal += OString( "9223372036854775807" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11506,11 +13825,15 @@ namespace rtl_OStringBuffer expVal += OString( "7f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11525,11 +13848,15 @@ namespace rtl_OStringBuffer expVal += OString( "7fffffffffffffff" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11544,11 +13871,15 @@ namespace rtl_OStringBuffer expVal += OString( "3j" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11563,11 +13894,15 @@ namespace rtl_OStringBuffer expVal += OString( "1y2p0ij32e8e7" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_Bounderies_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11636,11 +13971,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11656,11 +13995,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11676,11 +14019,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11696,11 +14043,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11715,11 +14066,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11735,11 +14090,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11755,11 +14114,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11775,11 +14138,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11794,11 +14161,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11814,11 +14185,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11834,11 +14209,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11854,11 +14233,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11873,11 +14256,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11893,11 +14280,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11913,11 +14304,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11933,11 +14328,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11952,11 +14351,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -11972,11 +14375,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -11992,11 +14399,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12012,11 +14423,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[0]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12031,11 +14446,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12051,11 +14470,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12071,11 +14494,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12091,11 +14518,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12110,11 +14541,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12130,11 +14565,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12150,11 +14589,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12170,11 +14613,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12189,11 +14636,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12209,11 +14660,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12229,11 +14684,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12249,11 +14708,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12268,11 +14731,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12288,11 +14755,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12308,11 +14779,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12328,11 +14803,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12347,11 +14826,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12367,11 +14850,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12387,11 +14874,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12407,11 +14898,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[1]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12426,11 +14921,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12446,11 +14945,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12466,11 +14969,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12486,11 +14993,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12505,11 +15016,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12525,11 +15040,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12545,11 +15064,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12565,11 +15088,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12584,11 +15111,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12604,11 +15135,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12624,11 +15159,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12644,11 +15183,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12663,11 +15206,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12683,11 +15230,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12703,11 +15254,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12723,11 +15278,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12742,11 +15301,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12762,11 +15325,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12782,11 +15349,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12802,11 +15373,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[2]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12821,11 +15396,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12841,11 +15420,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12861,11 +15444,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12881,11 +15468,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12900,11 +15491,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12920,11 +15515,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12940,11 +15539,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12960,11 +15563,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -12979,11 +15586,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -12999,11 +15610,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13019,11 +15634,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13039,11 +15658,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13058,11 +15681,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13078,11 +15705,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13098,11 +15729,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13118,11 +15753,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13137,11 +15776,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13157,11 +15800,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13177,11 +15824,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13197,11 +15848,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[3]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13216,11 +15871,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13236,11 +15895,15 @@ namespace rtl_OStringBuffer expVal += OString( "100" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13256,11 +15919,15 @@ namespace rtl_OStringBuffer expVal += OString( "1000" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13276,11 +15943,15 @@ namespace rtl_OStringBuffer expVal += OString( "1111" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 2)_006_negative_kRadixBinary for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13295,11 +15966,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13315,11 +15990,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13335,11 +16014,15 @@ namespace rtl_OStringBuffer expVal += OString( "10" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13355,11 +16038,15 @@ namespace rtl_OStringBuffer expVal += OString( "17" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 8)_006_negative_kRadixOctol for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13374,11 +16061,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13394,11 +16085,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13414,11 +16109,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13434,11 +16133,15 @@ namespace rtl_OStringBuffer expVal += OString( "15" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 10)_006_negative_kRadixDecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13453,11 +16156,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13473,11 +16180,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13493,11 +16204,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13513,11 +16228,15 @@ namespace rtl_OStringBuffer expVal += OString( "f" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 16)_006_negative_kRadixHexdecimal for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13532,11 +16251,15 @@ namespace rtl_OStringBuffer expVal += OString( "0" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13552,11 +16275,15 @@ namespace rtl_OStringBuffer expVal += OString( "4" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13572,11 +16299,15 @@ namespace rtl_OStringBuffer expVal += OString( "8" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13592,11 +16323,15 @@ namespace rtl_OStringBuffer expVal += OString( "z" ); aStrBuf.append( input, radix ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", + expVal, OString(aStrBuf.getStr()) + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "append(sal_Int64, radix 36)_006_negative_kRadixBase36 for arrOUS[4]", - aStrBuf.getStr()== expVal && - aStrBuf.getLength() == expVal.getLength() + expVal.getLength(), aStrBuf.getLength() ); } @@ -13677,11 +16412,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 11 and return OStringBuffer[0]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 11 and return OStringBuffer[0]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13694,11 +16433,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 0 and return OStringBuffer[0]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 0 and return OStringBuffer[0]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13711,11 +16454,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -11 and return OStringBuffer[0]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -11 and return OStringBuffer[0]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13727,11 +16474,15 @@ namespace rtl_OStringBuffer sal_Int64 input = SAL_CONST_INT64(9223372036854775807); aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 9223372036854775807 and return OStringBuffer[0]+9223372036854775807", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 9223372036854775807 and return OStringBuffer[0]+9223372036854775807", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13748,7 +16499,12 @@ namespace rtl_OStringBuffer CPPUNIT_ASSERT_MESSAGE ( "input Int64 -9223372036854775808 and return OStringBuffer[0]+(-9223372036854775808)", - bRes && aStrBuf.getLength() == expVal.getLength() + bRes + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -9223372036854775808 and return OStringBuffer[0]+(-9223372036854775808)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13761,11 +16517,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 11 and return OStringBuffer[1]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 11 and return OStringBuffer[1]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13778,11 +16538,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 0 and return OStringBuffer[1]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 0 and return OStringBuffer[1]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13795,11 +16559,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -11 and return OStringBuffer[1]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -11 and return OStringBuffer[1]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13811,11 +16579,15 @@ namespace rtl_OStringBuffer sal_Int64 input = SAL_CONST_INT64(9223372036854775807); aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 9223372036854775807 and return OStringBuffer[1]+9223372036854775807", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 9223372036854775807 and return OStringBuffer[1]+9223372036854775807", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13828,11 +16600,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -9223372036854775808 and return OStringBuffer[1]+(-9223372036854775808)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -9223372036854775808 and return OStringBuffer[1]+(-9223372036854775808)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13845,11 +16621,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 11 and return OStringBuffer[2]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 11 and return OStringBuffer[2]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13862,11 +16642,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 0 and return OUStringBuffer[2]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 0 and return OUStringBuffer[2]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13879,11 +16663,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -11 and return OUStringBuffer[2]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -11 and return OUStringBuffer[2]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13895,11 +16683,15 @@ namespace rtl_OStringBuffer sal_Int64 input = SAL_CONST_INT64(9223372036854775807); aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 9223372036854775807 and return OStringBuffer[2]+9223372036854775807", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 9223372036854775807 and return OStringBuffer[2]+9223372036854775807", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13912,11 +16704,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -9223372036854775808 and return OStringBuffer[2]+(-9223372036854775808)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -9223372036854775808 and return OStringBuffer[2]+(-9223372036854775808)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13929,11 +16725,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 11 and return OStringBuffer[3]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 11 and return OStringBuffer[3]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13946,11 +16746,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 0 and return OStringBuffer[3]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 0 and return OStringBuffer[3]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13963,11 +16767,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -11 and return OStringBuffer[3]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -11 and return OStringBuffer[3]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13979,11 +16787,15 @@ namespace rtl_OStringBuffer sal_Int64 input = SAL_CONST_INT64(9223372036854775807); aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 9223372036854775807 and return OStringBuffer[3]+9223372036854775807", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 9223372036854775807 and return OStringBuffer[3]+9223372036854775807", + expVal.getLength(), aStrBuf.getLength() ); } @@ -13996,11 +16808,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -9223372036854775808 and return OStringBuffer[3]+(-9223372036854775808)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -9223372036854775808 and return OStringBuffer[3]+(-9223372036854775808)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -14013,11 +16829,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 11 and return OStringBuffer[4]+11", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 11 and return OStringBuffer[4]+11", + expVal.getLength(), aStrBuf.getLength() ); } @@ -14030,11 +16850,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 0 and return OStringBuffer[4]+0", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 0 and return OStringBuffer[4]+0", + expVal.getLength(), aStrBuf.getLength() ); } @@ -14047,11 +16871,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -11 and return OStringBuffer[4]+(-11)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -11 and return OStringBuffer[4]+(-11)", + expVal.getLength(), aStrBuf.getLength() ); } @@ -14063,11 +16891,15 @@ namespace rtl_OStringBuffer sal_Int64 input = SAL_CONST_INT64(9223372036854775807); aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 9223372036854775807 and return OStringBuffer[4]+9223372036854775807", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 9223372036854775807 and return OStringBuffer[4]+9223372036854775807", + expVal.getLength(), aStrBuf.getLength() ); } @@ -14080,11 +16912,15 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "input Int64 -9223372036854775808 and return OStringBuffer[4]+(-9223372036854775808)", - (aStrBuf.toString() == expVal && - aStrBuf.getLength() == expVal.getLength()) + expVal, aStrBuf.toString() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "input Int64 -9223372036854775808 and return OStringBuffer[4]+(-9223372036854775808)", + expVal.getLength(), aStrBuf.getLength() ); } diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index d551f471d989..3f62c6ea3e06 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -923,7 +923,10 @@ namespace osl_Thread CPPUNIT_ASSERT_MESSAGE( "Test isRunning", - bRes && bRunning_sup ); + bRes ); + CPPUNIT_ASSERT_MESSAGE( + "Test isRunning", + bRunning_sup ); CPPUNIT_ASSERT_MESSAGE( "Test isRunning", bRunning_res ); @@ -1189,8 +1192,14 @@ namespace osl_Thread #ifndef _WIN32 CPPUNIT_ASSERT_MESSAGE( "SetPriority", - nValueHighest > 0 && - nValueAboveNormal > 0 && + nValueHighest > 0 + ); + CPPUNIT_ASSERT_MESSAGE( + "SetPriority", + nValueAboveNormal > 0 + ); + CPPUNIT_ASSERT_MESSAGE( + "SetPriority", nValueNormal > 0 ); CPPUNIT_ASSERT_MESSAGE( @@ -1272,7 +1281,10 @@ namespace osl_Thread CPPUNIT_ASSERT_MESSAGE( "SetPriority", /* nValueHighest > 0 && */ - nValueAboveNormal > 0 && + nValueAboveNormal > 0 + ); + CPPUNIT_ASSERT_MESSAGE( + "SetPriority", nValueNormal > 0 ); CPPUNIT_ASSERT_MESSAGE( @@ -1964,9 +1976,13 @@ namespace osl_ThreadData char cData1 = aThread1.m_Char_Test; char cData2 = aThread2.m_Char_Test; - CPPUNIT_ASSERT_MESSAGE( + CPPUNIT_ASSERT_EQUAL_MESSAGE( "ThreadData setData: ", - cData1 == 'a' && cData2 == 'b' + 'a', cData1 + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "ThreadData setData: ", + 'b', cData2 ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "ThreadData setData: ", diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index 3d27ba52c9c7..4bf0512a0968 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -197,7 +197,10 @@ public: OString aSum1 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5); OString aSum2 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5); - CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aSum1.getLength() == 32 && aSum2.getLength() == 32 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "md5sum must have a length", sal_Int32(32), aSum1.getLength() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "md5sum must have a length", sal_Int32(32), aSum2.getLength() ); CPPUNIT_ASSERT_EQUAL_MESSAGE("source is the same, dest must be also the same", aSum1, aSum2); } @@ -205,7 +208,10 @@ public: OString aSum1 = getDigest(sSampleString, rtl_Digest_AlgorithmMD5); OString aSum2 = getDigest(sSampleString_only_one_diff, rtl_Digest_AlgorithmMD5); - CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aSum1.getLength() == 32 && aSum2.getLength() == 32 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "md5sum must have a length", sal_Int32(32), aSum1.getLength() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "md5sum must have a length", sal_Int32(32), aSum2.getLength() ); CPPUNIT_ASSERT_MESSAGE("differ only in one char", aSum1 != aSum2); } } diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index c43638277c90..4987b5a0c372 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -260,14 +260,20 @@ public: std::unique_ptr<sal_uInt8[]> pBuffer( new sal_uInt8[ nBufLen << 1 ] ); memset(pBuffer.get(), 0, nBufLen << 1); - CPPUNIT_ASSERT_MESSAGE("memset failed", pBuffer[4] == 0 && pBuffer[5] == 0 && pBuffer[6] == 0 && pBuffer[7] == 0); + CPPUNIT_ASSERT_EQUAL_MESSAGE("memset failed", sal_uInt8(0), pBuffer[4]); + CPPUNIT_ASSERT_EQUAL_MESSAGE("memset failed", sal_uInt8(0), pBuffer[5]); + CPPUNIT_ASSERT_EQUAL_MESSAGE("memset failed", sal_uInt8(0), pBuffer[6]); + CPPUNIT_ASSERT_EQUAL_MESSAGE("memset failed", sal_uInt8(0), pBuffer[7]); rtlRandomError aError = rtl_random_getBytes(aPool, pBuffer.get(), nBufLen); CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong parameter", rtl_Random_E_None, aError); printf("%2x %2x %2x %2x %2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3], pBuffer[4], pBuffer[5], pBuffer[6], pBuffer[7]); - CPPUNIT_ASSERT_MESSAGE("internal memory overwrite", pBuffer[4] == 0 && pBuffer[5] == 0 && pBuffer[6] == 0 && pBuffer[7] == 0); + CPPUNIT_ASSERT_EQUAL_MESSAGE("internal memory overwrite", sal_uInt8(0), pBuffer[4]); + CPPUNIT_ASSERT_EQUAL_MESSAGE("internal memory overwrite", sal_uInt8(0), pBuffer[5]); + CPPUNIT_ASSERT_EQUAL_MESSAGE("internal memory overwrite", sal_uInt8(0), pBuffer[6]); + CPPUNIT_ASSERT_EQUAL_MESSAGE("internal memory overwrite", sal_uInt8(0), pBuffer[7]); rtl_random_destroyPool(aPool); } diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx index eaa16c6eb0b8..88da153ae9ed 100644 --- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx +++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx @@ -1576,28 +1576,35 @@ namespace bool bRes1 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_ARABIC, &aInfo1 ); // implemented bool bRes11 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_CYRILLIC, &aInfo1 ); - CPPUNIT_ASSERT_MESSAGE("should return sal_False.", !bRes1 && !bRes11); + CPPUNIT_ASSERT_MESSAGE("should return sal_False.", !bRes1); + CPPUNIT_ASSERT_MESSAGE("should return sal_False.", !bRes11); aInfo2.StructSize = 5; bool bRes2 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_ARABIC, &aInfo2 ); bool bRes21 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_CYRILLIC, &aInfo2 ); - CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes2 && bRes21 && aInfo2.MinimumCharSize >=1 ); + CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes2); + CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes21); + CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", aInfo2.MinimumCharSize >=1 ); aInfo3.StructSize = 6; bool bRes3 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_ARABIC, &aInfo3 ); bool bRes31 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_CYRILLIC, &aInfo3 ); - CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes3 && bRes31); + CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes3); + CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes31); //&& aInfo2.MinimumCharSize >=1 ); aInfo4.StructSize = 8; bool bRes4 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_ARABIC, &aInfo4 ); bool bRes41 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_CYRILLIC, &aInfo4); - CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes4 && bRes41); + CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes4); + CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", bRes41); // && aInfo2.MinimumCharSize >=1 ); aInfo5.StructSize = sizeof aInfo5; bool bRes5 = rtl_getTextEncodingInfo( RTL_TEXTENCODING_APPLE_ARABIC, &aInfo5 ); - CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", !bRes5 && aInfo5.Flags == 0); + CPPUNIT_ASSERT_MESSAGE("StructSize<6 should return sal_True", !bRes5); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "StructSize<6 should return sal_True", sal_uInt32(0), aInfo5.Flags); } CPPUNIT_TEST_SUITE(testTextEncodingInfo); diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index b77e84afe2ff..aae77cfe32a4 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -123,7 +123,8 @@ public: rtl_string_newFromStr( &pName , "this is a bla.blubs.DNS-Name" ); rtl_createNamedUuid( pNamedUUID , NameSpace_DNS , pName ); rtl_createNamedUuid( pNamedUUID2 , NameSpace_DNS , pName ); - CPPUNIT_ASSERT_MESSAGE( "Same name should generate the same uuid", ! memcmp( pNamedUUID , pNamedUUID2 , 16 ) && rtl_compareUuid( pNamedUUID , pNamedUUID2 ) == 0 ); + CPPUNIT_ASSERT_MESSAGE( "Same name should generate the same uuid", ! memcmp( pNamedUUID , pNamedUUID2 , 16 )); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Same name should generate the same uuid", sal_Int32(0), rtl_compareUuid( pNamedUUID , pNamedUUID2 ) ); CPPUNIT_ASSERT_MESSAGE( "Same name should generate the same uuid", ! memcmp( pNamedUUID , pPriorCalculatedUUID , 16 ) ); // Different names does not generate the same uuid @@ -133,7 +134,8 @@ public: // the same name with different namespace uuid produces different uuids rtl_createNamedUuid( pNamedUUID , NameSpace_URL , pName ); - CPPUNIT_ASSERT_MESSAGE( " same name with different namespace uuid produces different uuids", memcmp( pNamedUUID , pNamedUUID2 , 16 ) && rtl_compareUuid( pNamedUUID , pNamedUUID2 ) != 0); + CPPUNIT_ASSERT_MESSAGE( " same name with different namespace uuid produces different uuids", memcmp( pNamedUUID , pNamedUUID2 , 16 )); + CPPUNIT_ASSERT_MESSAGE( " same name with different namespace uuid produces different uuids", rtl_compareUuid( pNamedUUID , pNamedUUID2 ) != 0); //test compareUuid if ( rtl_compareUuid( pNamedUUID , pNamedUUID2 ) > 0 ) diff --git a/sal/qa/sal/test_types.cxx b/sal/qa/sal/test_types.cxx index f863247b60fc..a03ccc93e754 100644 --- a/sal/qa/sal/test_types.cxx +++ b/sal/qa/sal/test_types.cxx @@ -34,7 +34,8 @@ template< typename T > void testPrintf( std::size_t const bufsize = 1000; char buf[bufsize]; int n = snprintf(buf, bufsize, format, argument); - CPPUNIT_ASSERT(n >= 0 && sal::static_int_cast< unsigned int >(n) < bufsize); + CPPUNIT_ASSERT(n >= 0); + CPPUNIT_ASSERT(sal::static_int_cast< unsigned int >(n) < bufsize); CPPUNIT_ASSERT_EQUAL(0, strcmp(buf, result)); } diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 8cc6fd029eeb..cd1110404eda 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -804,7 +804,8 @@ void ScCopyPasteTest::tdf137653_137654_autofillUserlist() bHasIdx2 = pListData->GetSubIndex(rDoc.GetString(nCol, nRow + 4, 0), nIdx2, bMatchCase); CPPUNIT_ASSERT_EQUAL(nType1, nType2); - CPPUNIT_ASSERT(bHasIdx1 && bHasIdx2); + CPPUNIT_ASSERT(bHasIdx1); + CPPUNIT_ASSERT(bHasIdx2); CPPUNIT_ASSERT_EQUAL(nIdx1, nIdx2); // userlist index value of cells } } @@ -820,7 +821,8 @@ void ScCopyPasteTest::tdf137653_137654_autofillUserlist() bHasIdx2 = pListData->GetSubIndex(rDoc.GetString(nCol + 4, nRow, 0), nIdx2, bMatchCase); CPPUNIT_ASSERT_EQUAL(nType1, nType2); - CPPUNIT_ASSERT(bHasIdx1 && bHasIdx2); + CPPUNIT_ASSERT(bHasIdx1); + CPPUNIT_ASSERT(bHasIdx2); CPPUNIT_ASSERT_EQUAL(nIdx1, nIdx2); // userlist index value of cells } } diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index b1e35efa9fc9..0595f0be8841 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -239,7 +239,8 @@ void testContentImpl(ScDocument& rDoc, sal_Int32 nFormat ) //same code for ods, SCCOL nCol = 4; SCROW nRow = 1; rDoc.ExtendMerge(4, 1, nCol, nRow, 0); - CPPUNIT_ASSERT_MESSAGE("merged cells are not imported", nCol == 5 && nRow == 2); + CPPUNIT_ASSERT_EQUAL_MESSAGE("merged cells are not imported", SCCOL(5), nCol); + CPPUNIT_ASSERT_EQUAL_MESSAGE("merged cells are not imported", SCROW(2), nRow); //check notes import ScAddress aAddress(7, 2, 0); @@ -368,7 +369,8 @@ void ScFiltersTest::testSharedFormulaXLS() CPPUNIT_ASSERT_MESSAGE("This should be a formula cell.", pCell); ScFormulaCellGroupRef xGroup = pCell->GetCellGroup(); CPPUNIT_ASSERT_MESSAGE("This cell should be a part of a cell group.", xGroup); - CPPUNIT_ASSERT_MESSAGE("Incorrect group geometry.", xGroup->mpTopCell->aPos.Row() == 1 && xGroup->mnLength == 18); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect group geometry.", SCROW(1), xGroup->mpTopCell->aPos.Row()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect group geometry.", SCROW(18), xGroup->mnLength); xDocSh->DoClose(); @@ -424,7 +426,8 @@ void ScFiltersTest::testSharedFormulaXLSX() CPPUNIT_ASSERT_MESSAGE("This should be a formula cell.", pCell); ScFormulaCellGroupRef xGroup = pCell->GetCellGroup(); CPPUNIT_ASSERT_MESSAGE("This cell should be a part of a cell group.", xGroup); - CPPUNIT_ASSERT_MESSAGE("Incorrect group geometry.", xGroup->mpTopCell->aPos.Row() == 1 && xGroup->mnLength == 18); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect group geometry.", SCROW(1), xGroup->mpTopCell->aPos.Row()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect group geometry.", SCROW(18), xGroup->mnLength); xDocSh->DoClose(); } diff --git a/sc/qa/unit/mark_test.cxx b/sc/qa/unit/mark_test.cxx index b2efc9a817a7..91b7af0e54b3 100644 --- a/sc/qa/unit/mark_test.cxx +++ b/sc/qa/unit/mark_test.cxx @@ -148,10 +148,12 @@ void Test::testSimpleMark( const ScRange& rRange, const ScRange& rSelectionCover { ScSheetLimits aSheetLimits(MAXCOL, MAXROW); ScMarkData aMark(aSheetLimits); - CPPUNIT_ASSERT( !aMark.IsMarked() && !aMark.IsMultiMarked() ); + CPPUNIT_ASSERT( !aMark.IsMarked() ); + CPPUNIT_ASSERT( !aMark.IsMultiMarked() ); aMark.SetMarkArea( rRange ); - CPPUNIT_ASSERT( aMark.IsMarked() && !aMark.IsMultiMarked() ); + CPPUNIT_ASSERT( aMark.IsMarked() ); + CPPUNIT_ASSERT( !aMark.IsMultiMarked() ); ScRange aRangeResult; aMark.GetMarkArea( aRangeResult ); @@ -255,7 +257,8 @@ void Test::testMultiMark( const MultiMarkTestData& rMarksData ) ScSheetLimits aSheetLimits(MAXCOL, MAXROW); ScMarkData aMark(aSheetLimits); ScMultiSel aMultiSel(aSheetLimits); - CPPUNIT_ASSERT( !aMark.IsMarked() && !aMark.IsMultiMarked() ); + CPPUNIT_ASSERT( !aMark.IsMarked() ); + CPPUNIT_ASSERT( !aMark.IsMultiMarked() ); CPPUNIT_ASSERT_EQUAL( SCCOL(0), aMultiSel.GetMultiSelectionCount() ); CPPUNIT_ASSERT( !aMultiSel.HasAnyMarks() ); diff --git a/sc/qa/unit/pivottable_filters_test.cxx b/sc/qa/unit/pivottable_filters_test.cxx index ecd7681aacae..f03b874ba7f3 100644 --- a/sc/qa/unit/pivottable_filters_test.cxx +++ b/sc/qa/unit/pivottable_filters_test.cxx @@ -260,9 +260,10 @@ void ScPivotTableFiltersTest::testPivotTableBasicODS() CPPUNIT_ASSERT_MESSAGE("Dimension expected, but not found.", hasDimension(aDims, "Row1")); CPPUNIT_ASSERT_MESSAGE("Dimension expected, but not found.", hasDimension(aDims, "Row2")); const ScDPSaveDimension* pDataLayout = pSaveData->GetExistingDataLayoutDimension(); - CPPUNIT_ASSERT_MESSAGE( - "There should be a data layout field as a row field.", - pDataLayout && pDataLayout->GetOrientation() == sheet::DataPilotFieldOrientation_ROW); + CPPUNIT_ASSERT_MESSAGE("There should be a data layout field as a row field.", pDataLayout); + CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be a data layout field as a row field.", + sheet::DataPilotFieldOrientation_ROW, + pDataLayout->GetOrientation()); // Column fields pSaveData->GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_COLUMN, aDims); @@ -1498,15 +1499,18 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "1" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "3" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } // Number formatting @@ -1523,15 +1527,18 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "1.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "3.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } // With thousand separator @@ -1548,15 +1555,18 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilter() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "10,000.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "20,000.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "30,000.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } xDocSh->DoClose(); @@ -1588,10 +1598,12 @@ void ScPivotTableFiltersTest::testPivotTableStringFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(2), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("United Kingdom"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("United States"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); xDocSh->DoClose(); } @@ -1624,15 +1636,18 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilter() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "2016. január 6." CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016. január 7." CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016. január 8." CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } { @@ -1644,15 +1659,18 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilter() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "2016-01-06" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016-01-07" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016-01-08" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } { @@ -1664,15 +1682,18 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilter() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "2016. 1. 6. 0:00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016. 1. 7. 0:00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016. 1. 8. 0:00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } xDocSh->DoClose(); @@ -1704,10 +1725,12 @@ void ScPivotTableFiltersTest::testPivotTableBoolFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(2), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("0"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("1"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); xDocSh->DoClose(); } @@ -1741,13 +1764,16 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("1"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("2"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("3"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } // Column field @@ -1760,13 +1786,16 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("2"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("3"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("4"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } // Page field @@ -1779,13 +1808,16 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("5"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("6"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("7"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } // Hidden field @@ -1798,13 +1830,16 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("8"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("9"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("10"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } xDocSh->DoClose(); @@ -1836,13 +1871,16 @@ void ScPivotTableFiltersTest::testPivotTableEmptyItem() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("Fruit"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("Vegetables"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName(""); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); xDocSh->DoClose(); } @@ -1874,13 +1912,16 @@ void ScPivotTableFiltersTest::testPivotTablePageFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("Banana"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("Carrots"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName(""); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } // More items are selected, but not all @@ -1892,13 +1933,16 @@ void ScPivotTableFiltersTest::testPivotTablePageFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("Vegetables"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("Fruit"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName(""); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } // All items are selected @@ -1910,13 +1954,16 @@ void ScPivotTableFiltersTest::testPivotTablePageFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("1"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("2"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("3"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } // Only one item is selected (a non-empty item) @@ -1928,13 +1975,16 @@ void ScPivotTableFiltersTest::testPivotTablePageFieldFilter() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("United States"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("United Kingdom"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName(""); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } xDocSh->DoClose(); @@ -1994,15 +2044,18 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "1" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "3" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } // Number formatting @@ -2019,15 +2072,18 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "1.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "3.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } // With thousand separator @@ -2044,15 +2100,18 @@ void ScPivotTableFiltersTest::testPivotTableDoubleFieldFilterXLSX() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "10,000.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "20,000.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "30,000.00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } xDocSh->DoClose(); @@ -2084,10 +2143,12 @@ void ScPivotTableFiltersTest::testPivotTableStringFieldFilterXLSX() CPPUNIT_ASSERT_EQUAL(size_t(2), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("United Kingdom"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("United States"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); xDocSh->DoClose(); } @@ -2120,11 +2181,13 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "2016. január 7." CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016. január 8." CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } { @@ -2136,11 +2199,13 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "2016-01-07" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016-01-08" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } { @@ -2152,11 +2217,13 @@ void ScPivotTableFiltersTest::testPivotTableDateFieldFilterXLSX() auto aIter = rMembers.begin(); ScDPSaveMember* pMember = *aIter; // "2016. 1. 7. 0:00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); ++aIter; pMember = *aIter; // "2016. 1. 8. 0:00" CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } xDocSh->DoClose(); @@ -2188,10 +2255,12 @@ void ScPivotTableFiltersTest::testPivotTableBoolFieldFilterXLSX() CPPUNIT_ASSERT_EQUAL(size_t(2), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("0"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("1"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); xDocSh->DoClose(); } @@ -2225,13 +2294,16 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("1"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("2"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("3"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } // Column field @@ -2244,13 +2316,16 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("2"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("3"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("4"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); } // Page field @@ -2263,13 +2338,16 @@ void ScPivotTableFiltersTest::testPivotTableRowColPageFieldFilterXLSX() CPPUNIT_ASSERT_EQUAL(size_t(3), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("5"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("6"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); pMember = pSaveDim->GetExistingMemberByName("7"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(pMember->GetIsVisible()); } // Hidden field @@ -2320,7 +2398,8 @@ void ScPivotTableFiltersTest::testPivotTableErrorItemFilterXLSX() CPPUNIT_ASSERT_EQUAL(size_t(4), rMembers.size()); ScDPSaveMember* pMember = pSaveDim->GetExistingMemberByName("#DIV/0!"); CPPUNIT_ASSERT(pMember); - CPPUNIT_ASSERT(pMember->HasIsVisible() && !pMember->GetIsVisible()); + CPPUNIT_ASSERT(pMember->HasIsVisible()); + CPPUNIT_ASSERT(!pMember->GetIsVisible()); xDocSh->DoClose(); } diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx index e2f215cd2b03..3c8630033d0f 100644 --- a/sc/qa/unit/scshapetest.cxx +++ b/sc/qa/unit/scshapetest.cxx @@ -610,8 +610,10 @@ void ScShapeTest::testTdf137576_LogicRectInNewMeasureline() ScDrawObjData* pNData = ScDrawLayer::GetNonRotatedObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to get NonRotatedAnchor", pNData); // Without the fix all four values would be zero. - CPPUNIT_ASSERT(pNData->maStart.Col() == 1 && pNData->maStart.Row() == 2); - CPPUNIT_ASSERT(pNData->maEnd.Col() == 7 && pNData->maEnd.Row() == 2); + CPPUNIT_ASSERT_EQUAL(SCCOL(1), pNData->maStart.Col()); + CPPUNIT_ASSERT_EQUAL(SCROW(2), pNData->maStart.Row()); + CPPUNIT_ASSERT_EQUAL(SCCOL(7), pNData->maEnd.Col()); + CPPUNIT_ASSERT_EQUAL(SCROW(2), pNData->maEnd.Row()); pDocSh->DoClose(); } diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 2b8738d2cf99..14f218aa5eaf 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -4732,7 +4732,8 @@ void ScExportTest::testHyperlinkTargetFrameODS() CPPUNIT_ASSERT(pEditText); const SvxFieldData* pData = pEditText->GetFieldData(0, 0, text::textfield::Type::URL); - CPPUNIT_ASSERT_MESSAGE("Failed to get the URL data.", pData && pData->GetClassId() == text::textfield::Type::URL); + CPPUNIT_ASSERT_MESSAGE("Failed to get the URL data.", pData); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Failed to get the URL data.", text::textfield::Type::URL, pData->GetClassId()); const SvxURLField* pURLData = static_cast<const SvxURLField*>(pData); OUString aTargetFrame = pURLData->GetTargetFrame(); @@ -5259,7 +5260,8 @@ void ScExportTest::testRotatedImageODS() sTranslate = sTranslate.copy(1, sTranslate.getLength()-2); // remove '(' and ')' const OUString sX(sTranslate.getToken(0, ' ')); const OUString sY(sTranslate.getToken(1, ' ')); - CPPUNIT_ASSERT(sX.endsWith("mm") && sY.endsWith("mm")); + CPPUNIT_ASSERT(sX.endsWith("mm")); + CPPUNIT_ASSERT(sY.endsWith("mm")); xDocSh->DoClose(); } diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 75d6e806f950..d0553d74e3c4 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1091,15 +1091,25 @@ void testDBRanges_Impl(ScDocument& rDoc, sal_Int32 nFormat) bool bHidden; SCROW nRow1, nRow2; bHidden = rDoc.RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("Sheet1: row 0 should be visible", !bHidden && nRow1 == 0 && nRow2 == 0); + CPPUNIT_ASSERT_MESSAGE("Sheet1: row 0 should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: row 0 should be visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: row 0 should be visible", SCROW(0), nRow2); bHidden = rDoc.RowHidden(1, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("Sheet1: rows 1-2 should be hidden", bHidden && nRow1 == 1 && nRow2 == 2); + CPPUNIT_ASSERT_MESSAGE("Sheet1: rows 1-2 should be hidden", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: rows 1-2 should be hidden", SCROW(1), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: rows 1-2 should be hidden", SCROW(2), nRow2); bHidden = rDoc.RowHidden(3, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("Sheet1: row 3 should be visible", !bHidden && nRow1 == 3 && nRow2 == 3); + CPPUNIT_ASSERT_MESSAGE("Sheet1: row 3 should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: row 3 should be visible", SCROW(3), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: row 3 should be visible", SCROW(3), nRow2); bHidden = rDoc.RowHidden(4, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("Sheet1: row 4-5 should be hidden", bHidden && nRow1 == 4 && nRow2 == 5); + CPPUNIT_ASSERT_MESSAGE("Sheet1: row 4-5 should be hidden", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: row 4-5 should be hidden", SCROW(4), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: row 4-5 should be hidden", SCROW(5), nRow2); bHidden = rDoc.RowHidden(6, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("Sheet1: row 6-end should be visible", !bHidden && nRow1 == 6 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("Sheet1: row 6-end should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: row 6-end should be visible", SCROW(6), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet1: row 6-end should be visible", MAXROW, nRow2); if (nFormat == FORMAT_ODS) //excel doesn't support named db ranges { double aValue; @@ -2347,7 +2357,8 @@ void ScFiltersTest::testRichTextContentODS() bHasItalic = (rItem.GetPosture() == ITALIC_NORMAL); } } - CPPUNIT_ASSERT_MESSAGE("This sentence is expected to have both bold and italic sequences.", bHasBold && bHasItalic); + CPPUNIT_ASSERT_MESSAGE("This sentence is expected to have both bold and italic sequences.", bHasBold); + CPPUNIT_ASSERT_MESSAGE("This sentence is expected to have both bold and italic sequences.", bHasItalic); } // Cell with multi-line content with formatting applied. @@ -2417,7 +2428,8 @@ void ScFiltersTest::testRichTextContentODS() pEditText = rDoc.GetEditText(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve edit text object.", pEditText); const SvxFieldData* pData = pEditText->GetFieldData(0, 0, text::textfield::Type::URL); - CPPUNIT_ASSERT_MESSAGE("Failed to get the URL data.", pData && pData->GetClassId() == text::textfield::Type::URL); + CPPUNIT_ASSERT_MESSAGE("Failed to get the URL data.", pData); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Failed to get the URL data.", text::textfield::Type::URL, pData->GetClassId()); const SvxURLField* pURLData = static_cast<const SvxURLField*>(pData); CPPUNIT_ASSERT_MESSAGE("URL is not absolute with respect to the file system.", pURLData->GetURL().startsWith("file:///")); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 25b276fe7b87..460f85f302c5 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -358,7 +358,8 @@ void Test::testRangeList() CPPUNIT_ASSERT_EQUAL_MESSAGE("List should have one range.", size_t(1), aRL.size()); const ScRange* p = &aRL[0]; CPPUNIT_ASSERT_MESSAGE("Failed to get the range object.", p); - CPPUNIT_ASSERT_MESSAGE("Wrong range.", p->aStart == ScAddress(1,1,0) && p->aEnd == ScAddress(3,10,0)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong range.", ScAddress(1,1,0), p->aStart); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong range.", ScAddress(3,10,0), p->aEnd); // TODO: Add more tests here. @@ -1799,12 +1800,16 @@ void Test::testMatrix() pMat = new ScMatrix(0, 0, 0.0); SCSIZE nC, nR; pMat->GetDimensions(nC, nR); - CPPUNIT_ASSERT_MESSAGE("matrix is not empty", nC == 0 && nR == 0); + CPPUNIT_ASSERT_EQUAL_MESSAGE("matrix is not empty", SCSIZE(0), nC); + CPPUNIT_ASSERT_EQUAL_MESSAGE("matrix is not empty", SCSIZE(0), nR); pMat->Resize(4, 10, 0.0); pMat->GetDimensions(nC, nR); - CPPUNIT_ASSERT_MESSAGE("matrix size is not as expected", nC == 4 && nR == 10); + CPPUNIT_ASSERT_EQUAL_MESSAGE("matrix size is not as expected", SCSIZE(4), nC); + CPPUNIT_ASSERT_EQUAL_MESSAGE("matrix size is not as expected", SCSIZE(10), nR); CPPUNIT_ASSERT_MESSAGE("both 'and' and 'or' should evaluate to false", - !pMat->And() && !pMat->Or()); + !pMat->And()); + CPPUNIT_ASSERT_MESSAGE("both 'and' and 'or' should evaluate to false", + !pMat->Or()); // Resizing into a larger matrix should fill the void space with zeros. checkMatrixElements<AllZeroMatrix>(*pMat); @@ -1813,10 +1818,14 @@ void Test::testMatrix() checkMatrixElements<PartiallyFilledZeroMatrix>(*pMat); CPPUNIT_ASSERT_MESSAGE("matrix is expected to be numeric", pMat->IsNumeric()); CPPUNIT_ASSERT_MESSAGE("partially non-zero matrix should evaluate false on 'and' and true on 'or", - !pMat->And() && pMat->Or()); + !pMat->And()); + CPPUNIT_ASSERT_MESSAGE("partially non-zero matrix should evaluate false on 'and' and true on 'or", + pMat->Or()); pMat->FillDouble(5.0, 0, 0, nC-1, nR-1); CPPUNIT_ASSERT_MESSAGE("fully non-zero matrix should evaluate true both on 'and' and 'or", - pMat->And() && pMat->Or()); + pMat->And()); + CPPUNIT_ASSERT_MESSAGE("fully non-zero matrix should evaluate true both on 'and' and 'or", + pMat->Or()); // Test the AND and OR evaluations. pMat = new ScMatrix(2, 2, 0.0); @@ -1836,7 +1845,8 @@ void Test::testMatrix() // Now test the empty matrix type. pMat = new ScMatrix(10, 20); pMat->GetDimensions(nC, nR); - CPPUNIT_ASSERT_MESSAGE("matrix size is not as expected", nC == 10 && nR == 20); + CPPUNIT_ASSERT_EQUAL_MESSAGE("matrix size is not as expected", SCSIZE(10), nC); + CPPUNIT_ASSERT_EQUAL_MESSAGE("matrix size is not as expected", SCSIZE(20), nR); checkMatrixElements<AllEmptyMatrix>(*pMat); pMat->PutBoolean(true, 1, 1); @@ -2069,7 +2079,9 @@ void Test::testSheetCopy() SCROW nRow1, nRow2; bool bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden && nRow1 == 0 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", MAXROW, nRow2); // insert a note ScAddress aAdrA1 (0,2,0); // empty cell content. @@ -2082,7 +2094,9 @@ void Test::testSheetCopy() static_cast<SCTAB>(2), m_pDoc->GetTableCount()); bHidden = m_pDoc->RowHidden(0, 1, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("copied sheet should also have all rows visible as the original.", !bHidden && nRow1 == 0 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("copied sheet should also have all rows visible as the original.", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("copied sheet should also have all rows visible as the original.", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("copied sheet should also have all rows visible as the original.", MAXROW, nRow2); CPPUNIT_ASSERT_MESSAGE("There should be note on A3 in new sheet", m_pDoc->HasNote(ScAddress(0,2,1))); CPPUNIT_ASSERT_EQUAL(OUString("copy me"), m_pDoc->GetString(ScAddress(0,0,1))); @@ -2101,22 +2115,34 @@ void Test::testSheetCopy() m_pDoc->SetRowHidden(5, 10, 0, true); bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 0 - 4 should be visible", !bHidden && nRow1 == 0 && nRow2 == 4); + CPPUNIT_ASSERT_MESSAGE("rows 0 - 4 should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 0 - 4 should be visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 0 - 4 should be visible", SCROW(4), nRow2); bHidden = m_pDoc->RowHidden(5, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 5 - 10 should be hidden", bHidden && nRow1 == 5 && nRow2 == 10); + CPPUNIT_ASSERT_MESSAGE("rows 5 - 10 should be hidden", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 5 - 10 should be hidden", SCROW(5), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 5 - 10 should be hidden", SCROW(10), nRow2); bHidden = m_pDoc->RowHidden(11, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden && nRow1 == 11 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 11 - maxrow should be visible", SCROW(11), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 11 - maxrow should be visible", MAXROW, nRow2); // Copy the sheet once again. m_pDoc->CopyTab(0, 1); CPPUNIT_ASSERT_EQUAL_MESSAGE("document now should have two sheets.", static_cast<SCTAB>(2), m_pDoc->GetTableCount()); bHidden = m_pDoc->RowHidden(0, 1, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 0 - 4 should be visible", !bHidden && nRow1 == 0 && nRow2 == 4); + CPPUNIT_ASSERT_MESSAGE("rows 0 - 4 should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 0 - 4 should be visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 0 - 4 should be visible", SCROW(4), nRow2); bHidden = m_pDoc->RowHidden(5, 1, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 5 - 10 should be hidden", bHidden && nRow1 == 5 && nRow2 == 10); + CPPUNIT_ASSERT_MESSAGE("rows 5 - 10 should be hidden", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 5 - 10 should be hidden", SCROW(5), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 5 - 10 should be hidden", SCROW(10), nRow2); bHidden = m_pDoc->RowHidden(11, 1, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden && nRow1 == 11 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 11 - maxrow should be visible", SCROW(11), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 11 - maxrow should be visible", MAXROW, nRow2); m_pDoc->DeleteTab(1); m_pDoc->DeleteTab(0); } @@ -2127,40 +2153,58 @@ void Test::testSheetMove() CPPUNIT_ASSERT_EQUAL_MESSAGE("document should have one sheet to begin with.", static_cast<SCTAB>(1), m_pDoc->GetTableCount()); SCROW nRow1, nRow2; bool bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden && nRow1 == 0 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", MAXROW, nRow2); //test if inserting before another sheet works m_pDoc->InsertTab(0, "TestTab2"); CPPUNIT_ASSERT_EQUAL_MESSAGE("document should have two sheets", static_cast<SCTAB>(2), m_pDoc->GetTableCount()); bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden && nRow1 == 0 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", MAXROW, nRow2); // Move and test the result. m_pDoc->MoveTab(0, 1); CPPUNIT_ASSERT_EQUAL_MESSAGE("document now should have two sheets.", static_cast<SCTAB>(2), m_pDoc->GetTableCount()); bHidden = m_pDoc->RowHidden(0, 1, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("copied sheet should also have all rows visible as the original.", !bHidden && nRow1 == 0 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("copied sheet should also have all rows visible as the original.", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("copied sheet should also have all rows visible as the original.", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("copied sheet should also have all rows visible as the original.", MAXROW, nRow2); OUString aName; m_pDoc->GetName(0, aName); CPPUNIT_ASSERT_EQUAL_MESSAGE( "sheets should have changed places", OUString("TestTab1"), aName); m_pDoc->SetRowHidden(5, 10, 0, true); bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 0 - 4 should be visible", !bHidden && nRow1 == 0 && nRow2 == 4); + CPPUNIT_ASSERT_MESSAGE("rows 0 - 4 should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 0 - 4 should be visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 0 - 4 should be visible", SCROW(4), nRow2); bHidden = m_pDoc->RowHidden(5, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 5 - 10 should be hidden", bHidden && nRow1 == 5 && nRow2 == 10); + CPPUNIT_ASSERT_MESSAGE("rows 5 - 10 should be hidden", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 5 - 10 should be hidden", SCROW(5), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 5 - 10 should be hidden", SCROW(10), nRow2); bHidden = m_pDoc->RowHidden(11, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden && nRow1 == 11 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 11 - maxrow should be visible", SCROW(11), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 11 - maxrow should be visible", MAXROW, nRow2); // Move the sheet once again. m_pDoc->MoveTab(1, 0); CPPUNIT_ASSERT_EQUAL_MESSAGE("document now should have two sheets.", static_cast<SCTAB>(2), m_pDoc->GetTableCount()); bHidden = m_pDoc->RowHidden(0, 1, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 0 - 4 should be visible", !bHidden && nRow1 == 0 && nRow2 == 4); + CPPUNIT_ASSERT_MESSAGE("rows 0 - 4 should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 0 - 4 should be visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 0 - 4 should be visible", SCROW(4), nRow2); bHidden = m_pDoc->RowHidden(5, 1, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 5 - 10 should be hidden", bHidden && nRow1 == 5 && nRow2 == 10); + CPPUNIT_ASSERT_MESSAGE("rows 5 - 10 should be hidden", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 5 - 10 should be hidden", SCROW(5), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 5 - 10 should be hidden", SCROW(10), nRow2); bHidden = m_pDoc->RowHidden(11, 1, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden && nRow1 == 11 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("rows 11 - maxrow should be visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 11 - maxrow should be visible", SCROW(11), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 11 - maxrow should be visible", SCROW(MAXROW), nRow2); m_pDoc->GetName(0, aName); CPPUNIT_ASSERT_EQUAL_MESSAGE( "sheets should have changed places", OUString("TestTab2"), aName); m_pDoc->DeleteTab(1); @@ -2762,7 +2806,9 @@ void Test::testGraphicsInGroup() static_cast<SCTAB>(1), m_pDoc->GetTableCount()); SCROW nRow1, nRow2; bool bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden && nRow1 == 0 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", SCROW(MAXROW), nRow2); m_pDoc->InitDrawLayer(); ScDrawLayer *pDrawLayer = m_pDoc->GetDrawLayer(); @@ -2864,8 +2910,10 @@ void Test::testGraphicsInGroup() sal_Int32 n = pObj->GetPointCount(); CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be exactly 2 points in a line object.", static_cast<sal_Int32>(2), n); - CPPUNIT_ASSERT_MESSAGE("Line shape has changed.", - aStartPos == pObj->GetPoint(0) && aEndPos == pObj->GetPoint(1)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Line shape has changed.", + aStartPos, pObj->GetPoint(0)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Line shape has changed.", + aEndPos, pObj->GetPoint(1)); } m_pDoc->DeleteTab(0); @@ -2893,7 +2941,8 @@ void Test::testGraphicsOnSheetMove() const ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Object meta-data doesn't exist.", pData); - CPPUNIT_ASSERT_MESSAGE("Wrong sheet ID in cell anchor data!", pData->maStart.Tab() == 0 && pData->maEnd.Tab() == 0); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(0), pData->maStart.Tab()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(0), pData->maEnd.Tab()); pPage = pDrawLayer->GetPage(1); CPPUNIT_ASSERT_MESSAGE("No page instance for the 2nd sheet.", pPage); @@ -2904,41 +2953,52 @@ void Test::testGraphicsOnSheetMove() m_pDoc->InsertTab(0, "NewTab"); CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be 3 sheets.", static_cast<SCTAB>(3), m_pDoc->GetTableCount()); pPage = pDrawLayer->GetPage(0); - CPPUNIT_ASSERT_MESSAGE("1st sheet should have no object.", pPage && pPage->GetObjCount() == 0); + CPPUNIT_ASSERT_MESSAGE("1st sheet should have no object.", pPage); + CPPUNIT_ASSERT_EQUAL_MESSAGE("1st sheet should have no object.", size_t(0), pPage->GetObjCount()); pPage = pDrawLayer->GetPage(1); - CPPUNIT_ASSERT_MESSAGE("2nd sheet should have one object.", pPage && pPage->GetObjCount() == 1); + CPPUNIT_ASSERT_MESSAGE("2nd sheet should have one object.", pPage); + CPPUNIT_ASSERT_EQUAL_MESSAGE("2nd sheet should have one object.", size_t(1), pPage->GetObjCount()); pPage = pDrawLayer->GetPage(2); - CPPUNIT_ASSERT_MESSAGE("3rd sheet should have no object.", pPage && pPage->GetObjCount() == 0); + CPPUNIT_ASSERT_MESSAGE("3rd sheet should have no object.", pPage); + CPPUNIT_ASSERT_EQUAL_MESSAGE("3rd sheet should have no object.", size_t(0), pPage->GetObjCount()); - CPPUNIT_ASSERT_MESSAGE("Wrong sheet ID in cell anchor data!", pData->maStart.Tab() == 1 && pData->maEnd.Tab() == 1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(1), pData->maStart.Tab()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(1), pData->maEnd.Tab()); // Now, delete the sheet that just got inserted. The object should be back // on the 1st sheet. m_pDoc->DeleteTab(0); pPage = pDrawLayer->GetPage(0); - CPPUNIT_ASSERT_MESSAGE("1st sheet should have one object.", pPage && pPage->GetObjCount() == 1); + CPPUNIT_ASSERT_MESSAGE("1st sheet should have one object.", pPage); + CPPUNIT_ASSERT_EQUAL_MESSAGE("1st sheet should have one object.", size_t(1), pPage->GetObjCount()); CPPUNIT_ASSERT_EQUAL_MESSAGE("Size and position of the object shouldn't change.", aObjRect, pObj->GetLogicRect()); - CPPUNIT_ASSERT_MESSAGE("Wrong sheet ID in cell anchor data!", pData->maStart.Tab() == 0 && pData->maEnd.Tab() == 0); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(0), pData->maStart.Tab()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(0), pData->maEnd.Tab()); // Move the 1st sheet to the last position. m_pDoc->MoveTab(0, 1); pPage = pDrawLayer->GetPage(0); - CPPUNIT_ASSERT_MESSAGE("1st sheet should have no object.", pPage && pPage->GetObjCount() == 0); + CPPUNIT_ASSERT_MESSAGE("1st sheet should have no object.", pPage); + CPPUNIT_ASSERT_EQUAL_MESSAGE("1st sheet should have no object.", size_t(0), pPage->GetObjCount()); pPage = pDrawLayer->GetPage(1); - CPPUNIT_ASSERT_MESSAGE("2nd sheet should have one object.", pPage && pPage->GetObjCount() == 1); - CPPUNIT_ASSERT_MESSAGE("Wrong sheet ID in cell anchor data!", pData->maStart.Tab() == 1 && pData->maEnd.Tab() == 1); + CPPUNIT_ASSERT_MESSAGE("2nd sheet should have one object.", pPage); + CPPUNIT_ASSERT_EQUAL_MESSAGE("2nd sheet should have one object.", size_t(1), pPage->GetObjCount()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(1), pData->maStart.Tab()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(1), pData->maEnd.Tab()); // Copy the 2nd sheet, which has one drawing object to the last position. m_pDoc->CopyTab(1, 2); pPage = pDrawLayer->GetPage(2); - CPPUNIT_ASSERT_MESSAGE("Copied sheet should have one object.", pPage && pPage->GetObjCount() == 1); + CPPUNIT_ASSERT_MESSAGE("Copied sheet should have one object.", pPage); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Copied sheet should have one object.", size_t(1), pPage->GetObjCount()); pObj = pPage->GetObj(0); CPPUNIT_ASSERT_MESSAGE("Failed to get drawing object.", pObj); pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to get drawing object meta-data.", pData); - CPPUNIT_ASSERT_MESSAGE("Wrong sheet ID in cell anchor data!", pData->maStart.Tab() == 2 && pData->maEnd.Tab() == 2); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(2), pData->maStart.Tab()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong sheet ID in cell anchor data!", SCTAB(2), pData->maEnd.Tab()); m_pDoc->DeleteTab(2); m_pDoc->DeleteTab(1); @@ -3132,13 +3192,17 @@ void Test::testAutofilter() //control output SCROW nRow1, nRow2; bool bHidden = m_pDoc->RowHidden(2, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 2 & 3 should be hidden", bHidden && nRow1 == 2 && nRow2 == 3); + CPPUNIT_ASSERT_MESSAGE("rows 2 & 3 should be hidden", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 2 & 3 should be hidden", SCROW(2), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 2 & 3 should be hidden", SCROW(3), nRow2); // Remove filtering. rEntry.Clear(); m_pDoc->Query(0, aParam, true); bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("All rows should be shown.", !bHidden && nRow1 == 0 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("All rows should be shown.", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("All rows should be shown.", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("All rows should be shown.", SCROW(MAXROW), nRow2); // Filter for non-empty cells by column C. rEntry.bDoQuery = true; @@ -3148,11 +3212,17 @@ void Test::testAutofilter() // only row 3 should be hidden. The rest should be visible. bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 1 & 2 should be visible.", !bHidden && nRow1 == 0 && nRow2 == 1); + CPPUNIT_ASSERT_MESSAGE("rows 1 & 2 should be visible.", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 1 & 2 should be visible.", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 1 & 2 should be visible.", SCROW(1), nRow2); bHidden = m_pDoc->RowHidden(2, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("row 3 should be hidden.", bHidden && nRow1 == 2 && nRow2 == 2); + CPPUNIT_ASSERT_MESSAGE("row 3 should be hidden.", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 3 should be hidden.", SCROW(2), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 3 should be hidden.", SCROW(2), nRow2); bHidden = m_pDoc->RowHidden(3, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("row 4 and down should be visible.", !bHidden && nRow1 == 3 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("row 4 and down should be visible.", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 4 and down should be visible.", SCROW(3), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 4 and down should be visible.", SCROW(MAXROW), nRow2); // Now, filter for empty cells by column C. rEntry.SetQueryByEmpty(); @@ -3160,15 +3230,25 @@ void Test::testAutofilter() // Now, only row 1 and 3, and 6 and down should be visible. bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("row 1 should be visible.", !bHidden && nRow1 == 0 && nRow2 == 0); + CPPUNIT_ASSERT_MESSAGE("row 1 should be visible.", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 1 should be visible.", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 1 should be visible.", SCROW(0), nRow2); bHidden = m_pDoc->RowHidden(1, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("row 2 should be hidden.", bHidden && nRow1 == 1 && nRow2 == 1); + CPPUNIT_ASSERT_MESSAGE("row 2 should be hidden.", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 2 should be hidden.", SCROW(1), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 2 should be hidden.", SCROW(1), nRow2); bHidden = m_pDoc->RowHidden(2, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("row 3 should be visible.", !bHidden && nRow1 == 2 && nRow2 == 2); + CPPUNIT_ASSERT_MESSAGE("row 3 should be visible.", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 3 should be visible.", SCROW(2), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("row 3 should be visible.", SCROW(2), nRow2); bHidden = m_pDoc->RowHidden(3, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 4 & 5 should be hidden.", bHidden && nRow1 == 3 && nRow2 == 4); + CPPUNIT_ASSERT_MESSAGE("rows 4 & 5 should be hidden.", bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 4 & 5 should be hidden.", SCROW(3), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 4 & 5 should be hidden.", SCROW(4), nRow2); bHidden = m_pDoc->RowHidden(5, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 6 and down should be all visible.", !bHidden && nRow1 == 5 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("rows 6 and down should be all visible.", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 6 and down should be all visible.", SCROW(5), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 6 and down should be all visible.", SCROW(MAXROW), nRow2); m_pDoc->DeleteTab(0); } @@ -3307,10 +3387,14 @@ void Test::testAdvancedFilter() SCROW nRow1 = -1, nRow2 = -1; bFiltered = m_pDoc->RowFiltered(1, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 2-7 should be filtered out.", bFiltered && nRow1 == 1 && nRow2 == 6); + CPPUNIT_ASSERT_MESSAGE("rows 2-7 should be filtered out.", bFiltered); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 2-7 should be filtered out.", SCROW(1), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 2-7 should be filtered out.", SCROW(6), nRow2); bFiltered = m_pDoc->RowFiltered(7, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("rows 8-10 should be visible.", !bFiltered && nRow1 == 7 && nRow2 == 9); + CPPUNIT_ASSERT_MESSAGE("rows 8-10 should be visible.", !bFiltered); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 8-10 should be visible.", SCROW(7), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("rows 8-10 should be visible.", SCROW(9), nRow2); m_pDoc->DeleteTab(0); } @@ -4393,13 +4477,15 @@ void Test::testMergedCells() SCCOL nEndCol = 1; SCROW nEndRow = 1; m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0); - CPPUNIT_ASSERT_MESSAGE("did not merge cells", nEndCol == 3 && nEndRow == 3); + CPPUNIT_ASSERT_EQUAL_MESSAGE("did not merge cells", SCCOL(3), nEndCol); + CPPUNIT_ASSERT_EQUAL_MESSAGE("did not merge cells", SCROW(3), nEndRow); ScRange aRange(0,2,0,MAXCOL,2,0); ScMarkData aMark(m_pDoc->GetSheetLimits()); aMark.SetMarkArea(aRange); getDocShell().GetDocFunc().InsertCells(aRange, &aMark, INS_INSROWS_BEFORE, true, true); m_pDoc->ExtendMerge(1, 1, nEndCol, nEndRow, 0); - CPPUNIT_ASSERT_MESSAGE("did not increase merge area", nEndCol == 3 && nEndRow == 4); + CPPUNIT_ASSERT_EQUAL_MESSAGE("did not increase merge area", SCCOL(3), nEndCol); + CPPUNIT_ASSERT_EQUAL_MESSAGE("did not increase merge area", SCROW(4), nEndRow); m_pDoc->DeleteTab(0); } @@ -4709,8 +4795,10 @@ void Test::testJumpToPrecedentsDependents() ScAddress aA1(0, 0, 0); ScRangeList aRange(aA1); rDocFunc.DetectiveCollectAllSuccs(aRange, aRefTokens); + CPPUNIT_ASSERT_EQUAL_MESSAGE("C1:C2 should be the only dependent of A1.", + std::vector<ScTokenRef>::size_type(1), aRefTokens.size()); CPPUNIT_ASSERT_MESSAGE("C1:C2 should be the only dependent of A1.", - aRefTokens.size() == 1 && hasRange(m_pDoc, aRefTokens, ScRange(2, 0, 0, 2, 1, 0), aA1)); + hasRange(m_pDoc, aRefTokens, ScRange(2, 0, 0, 2, 1, 0), aA1)); } m_pDoc->DeleteTab(0); @@ -5697,7 +5785,9 @@ void Test::testAnchoredRotatedShape() m_pDoc->InsertTab(0, "TestTab"); SCROW nRow1, nRow2; bool bHidden = m_pDoc->RowHidden(0, 0, &nRow1, &nRow2); - CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden && nRow1 == 0 && nRow2 == MAXROW); + CPPUNIT_ASSERT_MESSAGE("new sheet should have all rows visible", !bHidden); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("new sheet should have all rows visible", SCROW(MAXROW), nRow2); m_pDoc->InitDrawLayer(); ScDrawLayer *pDrawLayer = m_pDoc->GetDrawLayer(); @@ -6527,8 +6617,10 @@ void Test::testUndoDataAnchor() ScAddress aNNewEnd = pNData->maEnd; CPPUNIT_ASSERT_EQUAL(aNewStart, aNNewStart); CPPUNIT_ASSERT_EQUAL(aNewEnd, aNNewEnd); - CPPUNIT_ASSERT_MESSAGE("Failed to compare Address.", aNewStart != aOldStart && aNewEnd != aOldEnd && - aNNewStart != aNOldStart && aNNewEnd != aNOldEnd ); + CPPUNIT_ASSERT_MESSAGE("Failed to compare Address.", aNewStart != aOldStart ); + CPPUNIT_ASSERT_MESSAGE("Failed to compare Address.", aNewEnd != aOldEnd ); + CPPUNIT_ASSERT_MESSAGE("Failed to compare Address.", aNNewStart != aNOldStart ); + CPPUNIT_ASSERT_MESSAGE("Failed to compare Address.", aNNewEnd != aNOldEnd ); SfxUndoManager* pUndoMgr = m_pDoc->GetUndoManager(); CPPUNIT_ASSERT(pUndoMgr); diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index a908ea378bcc..997fb4a944ef 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -531,7 +531,8 @@ void Test::testFetchVectorRefArray() aArray = m_pDoc->FetchVectorRefArray(ScAddress(2,0,0), 7); CPPUNIT_ASSERT_MESSAGE("Failed to fetch vector ref array.", aArray.isValid()); - CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpNumericArray && aArray.mpStringArray); + CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpNumericArray); + CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpStringArray); CPPUNIT_ASSERT_MESSAGE("Unexpected string cell.", equals(aArray, 0, "Header")); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 1, 11)); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 2, 12)); @@ -552,7 +553,8 @@ void Test::testFetchVectorRefArray() aArray = m_pDoc->FetchVectorRefArray(ScAddress(3,0,0), 8); CPPUNIT_ASSERT_MESSAGE("Failed to fetch vector ref array.", aArray.isValid()); - CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpNumericArray && aArray.mpStringArray); + CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpNumericArray); + CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpStringArray); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 0, 10)); CPPUNIT_ASSERT_MESSAGE("Unexpected string cell.", equals(aArray, 1, "Below 10")); CPPUNIT_ASSERT_MESSAGE("This should be empty.", isEmpty(aArray, 2)); @@ -574,7 +576,8 @@ void Test::testFetchVectorRefArray() // This array fits within a single formula block. aArray = m_pDoc->FetchVectorRefArray(ScAddress(4,0,0), 5); CPPUNIT_ASSERT_MESSAGE("Failed to fetch vector ref array.", aArray.isValid()); - CPPUNIT_ASSERT_MESSAGE("Array should be purely numeric.", aArray.mpNumericArray && !aArray.mpStringArray); + CPPUNIT_ASSERT_MESSAGE("Array should be purely numeric.", aArray.mpNumericArray); + CPPUNIT_ASSERT_MESSAGE("Array should be purely numeric.", !aArray.mpStringArray); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 0, 1)); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 1, 2)); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 2, 3)); @@ -584,7 +587,8 @@ void Test::testFetchVectorRefArray() // This array spans over multiple blocks. aArray = m_pDoc->FetchVectorRefArray(ScAddress(4,0,0), 11); CPPUNIT_ASSERT_MESSAGE("Failed to fetch vector ref array.", aArray.isValid()); - CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpNumericArray && aArray.mpStringArray); + CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpNumericArray); + CPPUNIT_ASSERT_MESSAGE("Array should have both numeric and string arrays.", aArray.mpStringArray); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 0, 1)); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 1, 2)); CPPUNIT_ASSERT_MESSAGE("Unexpected numeric cell.", equals(aArray, 2, 3)); @@ -945,7 +949,9 @@ void Test::testFormulaRefData() ScAddress aAddr(4,5,3), aPos(2,2,2); ScSingleRefData aRef; aRef.InitAddress(aAddr); - CPPUNIT_ASSERT_MESSAGE("Wrong ref data state.", !aRef.IsRowRel() && !aRef.IsColRel() && !aRef.IsTabRel()); + CPPUNIT_ASSERT_MESSAGE("Wrong ref data state.", !aRef.IsRowRel()); + CPPUNIT_ASSERT_MESSAGE("Wrong ref data state.", !aRef.IsColRel()); + CPPUNIT_ASSERT_MESSAGE("Wrong ref data state.", !aRef.IsTabRel()); CPPUNIT_ASSERT_EQUAL(SCCOL(4), aRef.Col()); CPPUNIT_ASSERT_EQUAL(SCROW(5), aRef.Row()); CPPUNIT_ASSERT_EQUAL(SCTAB(3), aRef.Tab()); @@ -6671,9 +6677,14 @@ void Test::testExternalRef() nFileId, aExtSh1Name, false); CPPUNIT_ASSERT_MESSAGE("Cache table for sheet 1 should exist.", pCacheTab); ScRange aCachedRange = getCachedRange(pCacheTab); - CPPUNIT_ASSERT_MESSAGE("Unexpected cached data range.", - aCachedRange.aStart.Col() == 0 && aCachedRange.aEnd.Col() == 1 && - aCachedRange.aStart.Row() == 0 && aCachedRange.aEnd.Row() == 4); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cached data range.", + SCCOL(0), aCachedRange.aStart.Col()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cached data range.", + SCCOL(1), aCachedRange.aEnd.Col()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cached data range.", + SCROW(0), aCachedRange.aStart.Row()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cached data range.", + SCROW(4), aCachedRange.aEnd.Row()); // Sheet2 is not referenced at all; the cache table shouldn't even exist. pCacheTab = pRefMgr->getCacheTable(nFileId, aExtSh2Name, false); @@ -6683,9 +6694,14 @@ void Test::testExternalRef() pCacheTab = pRefMgr->getCacheTable(nFileId, aExtSh3Name, false); CPPUNIT_ASSERT_MESSAGE("Cache table for sheet 3 should exist.", pCacheTab); aCachedRange = getCachedRange(pCacheTab); - CPPUNIT_ASSERT_MESSAGE("Unexpected cached data range.", - aCachedRange.aStart.Col() == 0 && aCachedRange.aEnd.Col() == 1 && - aCachedRange.aStart.Row() == 0 && aCachedRange.aEnd.Row() == 3); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cached data range.", + SCCOL(0), aCachedRange.aStart.Col()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cached data range.", + SCCOL(1), aCachedRange.aEnd.Col()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cached data range.", + SCROW(0), aCachedRange.aStart.Row()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cached data range.", + SCROW(3), aCachedRange.aEnd.Row()); // Unload the external document shell. xExtDocSh->DoClose(); @@ -6822,7 +6838,9 @@ void Test::testExternalRefFunctions() sal_uInt16 nFileId = pRefMgr->getExternalFileId(aExtDocName); const OUString* pFileName = pRefMgr->getExternalFileName(nFileId); CPPUNIT_ASSERT_MESSAGE("file name registration has somehow failed.", - pFileName && *pFileName == aExtDocName); + pFileName); + CPPUNIT_ASSERT_EQUAL_MESSAGE("file name registration has somehow failed.", + aExtDocName, *pFileName); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc. @@ -6884,7 +6902,8 @@ void Test::testExternalRefFunctions() const ScMatrix* pMat = pFC->GetMatrix(); CPPUNIT_ASSERT_MESSAGE("matrix expected", pMat != nullptr); pMat->GetDimensions( nMatCols, nMatRows); - CPPUNIT_ASSERT_MESSAGE("1x1 matrix expected", nMatCols == 1 && nMatRows == 1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("1x1 matrix expected", SCSIZE(1), nMatCols); + CPPUNIT_ASSERT_EQUAL_MESSAGE("1x1 matrix expected", SCSIZE(1), nMatRows); pRefMgr->clearCache(nFileId); testExtRefFuncT(m_pDoc, rExtDoc); diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index 00bb90dfe2c2..218e8e9dc942 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -8,6 +8,10 @@ */ #include <memory> +#include <string> + +#include <cppunit/TestAssert.h> + #include <sal/types.h> #include "ucalc.hxx" #include "helper/qahelper.hxx" @@ -30,6 +34,9 @@ #include <com/sun/star/sheet/DataPilotFieldReferenceType.hpp> #include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp> +template<> std::string CppUnit::assertion_traits<ScDPItemData>::toString(ScDPItemData const &) +{ return "ScDPItemData"; } //TODO: combine with ScDPItemData::Dump? + using namespace ::com::sun::star; namespace { @@ -69,9 +76,12 @@ ScRange insertDPSourceData(ScDocument* pDoc, DPFieldDef const aFields[], size_t SCROW nRow1 = 0, nRow2 = 0; SCCOL nCol1 = 0, nCol2 = 0; pDoc->GetDataArea(0, nCol1, nRow1, nCol2, nRow2, true, false); - CPPUNIT_ASSERT_MESSAGE("Data is expected to start from (col=0,row=0).", nCol1 == 0 && nRow1 == 0); - CPPUNIT_ASSERT_MESSAGE("Unexpected data range.", - nCol2 == static_cast<SCCOL>(nFieldCount - 1) && nRow2 == static_cast<SCROW>(nDataCount)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Data is expected to start from (col=0,row=0).", SCCOL(0), nCol1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Data is expected to start from (col=0,row=0).", SCROW(0), nRow1); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected data range.", + static_cast<SCCOL>(nFieldCount - 1), nCol2); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected data range.", + static_cast<SCROW>(nDataCount), nRow2); ScRange aSrcRange(nCol1, nRow1, 0, nCol2, nRow2, 0); Test::printRange(pDoc, aSrcRange, "Data sheet content"); @@ -364,8 +374,10 @@ void Test::testPivotTable() // even with the absence of data cache. aRefs.clear(); pDPs->ReloadCache(pDPObj, aRefs); - CPPUNIT_ASSERT_MESSAGE("It should return the same object as a reference.", - aRefs.size() == 1 && *aRefs.begin() == pDPObj); + CPPUNIT_ASSERT_EQUAL_MESSAGE("It should return the same object as a reference.", + o3tl::sorted_vector<ScDPObject*>::size_type(1), aRefs.size()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("It should return the same object as a reference.", + pDPObj, *aRefs.begin()); pDPs->FreeTable(pDPObj); @@ -723,8 +735,10 @@ void Test::testPivotTableNamedSource() CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess); } - CPPUNIT_ASSERT_MESSAGE("There should be one named range data cache.", - pDPs->GetNameCaches().size() == 1 && pDPs->GetSheetCaches().size() == 0); + CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be one named range data cache.", + size_t(1), pDPs->GetNameCaches().size()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be one named range data cache.", + size_t(0), pDPs->GetSheetCaches().size()); // Move the table with pivot table to the left of the source data sheet. m_pDoc->MoveTab(1, 0); @@ -734,8 +748,10 @@ void Test::testPivotTableNamedSource() CPPUNIT_ASSERT_EQUAL_MESSAGE("Pivot table output is on the wrong sheet!", static_cast<SCTAB>(0), pDPObj->GetOutRange().aStart.Tab()); - CPPUNIT_ASSERT_MESSAGE("Moving the pivot table to another sheet shouldn't have changed the cache state.", - pDPs->GetNameCaches().size() == 1 && pDPs->GetSheetCaches().size() == 0); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Moving the pivot table to another sheet shouldn't have changed the cache state.", + size_t(1), pDPs->GetNameCaches().size()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Moving the pivot table to another sheet shouldn't have changed the cache state.", + size_t(0), pDPs->GetSheetCaches().size()); const ScSheetSourceDesc* pDesc = pDPObj->GetSheetDesc(); CPPUNIT_ASSERT_MESSAGE("Sheet source description doesn't exist.", pDesc); @@ -793,29 +809,35 @@ void Test::testPivotTableCache() tools::Long nMemCount = aCache.GetDimMemberCount(0); CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", tools::Long(6), nMemCount); const ScDPItemData* pItem = aCache.GetItemDataById(0, 0); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::Value && - pItem->GetValue() == 12); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::Value, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + 12.0, pItem->GetValue()); pItem = aCache.GetItemDataById(0, 1); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::String && - pItem->GetString() == "A"); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::String, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + OUString("A"), pItem->GetString()); pItem = aCache.GetItemDataById(0, 2); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::String && - pItem->GetString() == "F"); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::String, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + OUString("F"), pItem->GetString()); pItem = aCache.GetItemDataById(0, 3); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::String && - pItem->GetString() == "R"); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::String, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + OUString("R"), pItem->GetString()); pItem = aCache.GetItemDataById(0, 4); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::String && - pItem->GetString() == "Y"); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::String, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + OUString("Y"), pItem->GetString()); pItem = aCache.GetItemDataById(0, 5); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::String && - pItem->GetString() == "Z"); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::String, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + OUString("Z"), pItem->GetString()); pItem = aCache.GetItemDataById(0, 6); CPPUNIT_ASSERT_MESSAGE("wrong item value", !pItem); @@ -823,17 +845,20 @@ void Test::testPivotTableCache() nMemCount = aCache.GetDimMemberCount(1); CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", tools::Long(3), nMemCount); pItem = aCache.GetItemDataById(1, 0); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::String && - pItem->GetString() == "A"); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::String, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + OUString("A"), pItem->GetString()); pItem = aCache.GetItemDataById(1, 1); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::String && - pItem->GetString() == "B"); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::String, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + OUString("B"), pItem->GetString()); pItem = aCache.GetItemDataById(1, 2); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::String && - pItem->GetString() == "C"); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::String, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + OUString("C"), pItem->GetString()); pItem = aCache.GetItemDataById(1, 3); CPPUNIT_ASSERT_MESSAGE("wrong item value", !pItem); @@ -841,29 +866,35 @@ void Test::testPivotTableCache() nMemCount = aCache.GetDimMemberCount(2); CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong dimension member count", tools::Long(6), nMemCount); pItem = aCache.GetItemDataById(2, 0); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::Value && - pItem->GetValue() == 8); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::Value, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + 8.0, pItem->GetValue()); pItem = aCache.GetItemDataById(2, 1); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::Value && - pItem->GetValue() == 12); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::Value, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + 12.0, pItem->GetValue()); pItem = aCache.GetItemDataById(2, 2); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::Value && - pItem->GetValue() == 15); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::Value, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + 15.0, pItem->GetValue()); pItem = aCache.GetItemDataById(2, 3); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::Value && - pItem->GetValue() == 20); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::Value, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + 20.0, pItem->GetValue()); pItem = aCache.GetItemDataById(2, 4); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::Value && - pItem->GetValue() == 30); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::Value, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + 30.0, pItem->GetValue()); pItem = aCache.GetItemDataById(2, 5); - CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem && - pItem->GetType() == ScDPItemData::Value && - pItem->GetValue() == 45); + CPPUNIT_ASSERT_MESSAGE("wrong item value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", ScDPItemData::Value, pItem->GetType()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong item value", + 45.0, pItem->GetValue()); pItem = aCache.GetItemDataById(2, 6); CPPUNIT_ASSERT_MESSAGE("wrong item value", !pItem); @@ -880,12 +911,14 @@ void Test::testPivotTableCache() { pItem = aCache.GetItemDataById(nDim, aCache.GetItemDataId(nDim, i, false)); aTest.SetString(OUString::createFromAscii(aChecks[i])); - CPPUNIT_ASSERT_MESSAGE("wrong data value", pItem && *pItem == aTest); + CPPUNIT_ASSERT_MESSAGE("wrong data value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong data value", aTest, *pItem); } pItem = aCache.GetItemDataById(nDim, aCache.GetItemDataId(nDim, 5, false)); aTest.SetValue(12); - CPPUNIT_ASSERT_MESSAGE("wrong data value", pItem && *pItem == aTest); + CPPUNIT_ASSERT_MESSAGE("wrong data value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong data value", aTest, *pItem); } { @@ -896,7 +929,8 @@ void Test::testPivotTableCache() { pItem = aCache.GetItemDataById(nDim, aCache.GetItemDataId(nDim, i, false)); aTest.SetString(OUString::createFromAscii(aChecks[i])); - CPPUNIT_ASSERT_MESSAGE("wrong data value", pItem && *pItem == aTest); + CPPUNIT_ASSERT_MESSAGE("wrong data value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong data value", aTest, *pItem); } } @@ -908,7 +942,8 @@ void Test::testPivotTableCache() { pItem = aCache.GetItemDataById(nDim, aCache.GetItemDataId(nDim, i, false)); aTest.SetValue(aChecks[i]); - CPPUNIT_ASSERT_MESSAGE("wrong data value", pItem && *pItem == aTest); + CPPUNIT_ASSERT_MESSAGE("wrong data value", pItem); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong data value", aTest, *pItem); } } } @@ -921,7 +956,8 @@ void Test::testPivotTableCache() aFilteredCache.fillTable(); sal_Int32 nRows = aFilteredCache.getRowSize(); - CPPUNIT_ASSERT_MESSAGE("Wrong dimension.", nRows == 6 && aFilteredCache.getColSize() == 3); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong dimension.", sal_Int32(6), nRows); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong dimension.", sal_Int32(3), aFilteredCache.getColSize()); for (sal_Int32 i = 0; i < nRows; ++i) { @@ -1530,8 +1566,10 @@ void Test::testPivotTableEmptyRows() o3tl::sorted_vector<ScDPObject*> aRefs; const char* pErr = pDPs->ReloadCache(pDPObj, aRefs); CPPUNIT_ASSERT_MESSAGE("Failed to reload cache.", !pErr); - CPPUNIT_ASSERT_MESSAGE("There should only be one pivot table linked to this cache.", - aRefs.size() == 1 && *aRefs.begin() == pDPObj); + CPPUNIT_ASSERT_EQUAL_MESSAGE("There should only be one pivot table linked to this cache.", + o3tl::sorted_vector<ScDPObject*>::size_type(1), aRefs.size()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("There should only be one pivot table linked to this cache.", + pDPObj, *aRefs.begin()); pDPObj->ClearTableData(); aOutRange = refresh(pDPObj); diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx index c965a71196a7..40e1b3b6bf35 100644 --- a/sc/qa/unit/ucalc_sharedformula.cxx +++ b/sc/qa/unit/ucalc_sharedformula.cxx @@ -39,12 +39,14 @@ void Test::testSharedFormulas() ScAddress aPos(1, 9, 0); // B10 m_pDoc->SetString(aPos, "=A10*2"); // Insert into B10. const ScFormulaCell* pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("Expected to be a non-shared cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("Expected to be a non-shared cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("Expected to be a non-shared cell.", !pFC->IsShared()); aPos.SetRow(10); // B11 m_pDoc->SetString(aPos, "=A11*2"); pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(9), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(2), pFC->GetSharedLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("The token is expected to be shared.", pFC->GetCode(), pFC->GetSharedCode()); @@ -52,7 +54,8 @@ void Test::testSharedFormulas() aPos.SetRow(8); // B9 m_pDoc->SetString(aPos, "=A9*2"); pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(3), pFC->GetSharedLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("The token is expected to be shared.", pFC->GetCode(), pFC->GetSharedCode()); @@ -60,13 +63,15 @@ void Test::testSharedFormulas() aPos.SetRow(12); // B13 m_pDoc->SetString(aPos, "=A13*2"); pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This formula cell shouldn't be shared yet.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This formula cell shouldn't be shared yet.", pFC); + CPPUNIT_ASSERT_MESSAGE("This formula cell shouldn't be shared yet.", !pFC->IsShared()); // Insert a formula to B12, and B9:B13 should be shared. aPos.SetRow(11); // B12 m_pDoc->SetString(aPos, "=A12*2"); pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(5), pFC->GetSharedLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("The token is expected to be shared.", pFC->GetCode(), pFC->GetSharedCode()); @@ -77,7 +82,8 @@ void Test::testSharedFormulas() aPos.SetRow(15); // B16 m_pDoc->SetString(aPos, "=A16*2"); pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(14), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(2), pFC->GetSharedLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("The token is expected to be shared.", pFC->GetCode(), pFC->GetSharedCode()); @@ -86,7 +92,8 @@ void Test::testSharedFormulas() aPos.SetRow(13); // B14 m_pDoc->SetString(aPos, "=A14*2"); pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("The token is expected to be shared.", pFC->GetCode(), pFC->GetSharedCode()); @@ -95,18 +102,21 @@ void Test::testSharedFormulas() aPos.SetRow(11); // B12 m_pDoc->SetString(aPos, "=$A$1*4"); pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell shouldn't be shared.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell shouldn't be shared.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell shouldn't be shared.", !pFC->IsShared()); aPos.SetRow(8); // B9 pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(3), pFC->GetSharedLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("The token is expected to be shared.", pFC->GetCode(), pFC->GetSharedCode()); aPos.SetRow(12); // B13 pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(12), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(4), pFC->GetSharedLength()); CPPUNIT_ASSERT_EQUAL_MESSAGE("The token is expected to be shared.", pFC->GetCode(), pFC->GetSharedCode()); @@ -121,7 +131,8 @@ void Test::testSharedFormulas() aPos.IncRow(); m_pDoc->SetString(aPos, "=A20*2"); pFC = m_pDoc->GetFormulaCell(aPos); - CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula cell.", pFC->IsShared()); // B13:B20 should be shared. CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(12), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedLength()); @@ -318,7 +329,8 @@ void Test::testSharedFormulasRefUpdate() ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12", "Wrong formula in B3"); const ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(3), pFC->GetSharedLength()); @@ -329,11 +341,14 @@ void Test::testSharedFormulasRefUpdate() ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12", "Wrong formula in B3"); pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", !pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,1,0)); - CPPUNIT_ASSERT_MESSAGE("B2 should be a non-shared formula cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B2 should be a non-shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("B2 should be a non-shared formula cell.", !pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,2,0)); - CPPUNIT_ASSERT_MESSAGE("B3 should be a non-shared formula cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B3 should be a non-shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("B3 should be a non-shared formula cell.", !pFC->IsShared()); // Delete cells over A11:B11 to bring it back to the previous state. m_pDoc->DeleteCol(ScRange(0,10,0,1,10,0)); @@ -343,7 +358,8 @@ void Test::testSharedFormulasRefUpdate() ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12", "Wrong formula in B3"); pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(3), pFC->GetSharedLength()); @@ -354,9 +370,11 @@ void Test::testSharedFormulasRefUpdate() ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A14", "Wrong formula in B3"); pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", !pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,1,0)); - CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(1), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(2), pFC->GetSharedLength()); @@ -368,7 +386,8 @@ void Test::testSharedFormulasRefUpdate() ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12", "Wrong formula in B3"); pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(3), pFC->GetSharedLength()); @@ -379,11 +398,14 @@ void Test::testSharedFormulasRefUpdate() ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12", "Wrong formula in B3"); pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", !pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,1,0)); - CPPUNIT_ASSERT_MESSAGE("B2 should be a non-shared formula cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B2 should be a non-shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("B2 should be a non-shared formula cell.", !pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,2,0)); - CPPUNIT_ASSERT_MESSAGE("B3 should be a non-shared formula cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B3 should be a non-shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("B3 should be a non-shared formula cell.", !pFC->IsShared()); // Insert cells over A12:B12 to shift to right. m_pDoc->InsertCol(ScRange(0,11,0,1,11,0)); @@ -392,10 +414,12 @@ void Test::testSharedFormulasRefUpdate() ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "C12", "Wrong formula in B3"); pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC && !pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", !pFC->IsShared()); // B2 and B3 should be grouped. pFC = m_pDoc->GetFormulaCell(ScAddress(1,1,0)); - CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(1), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(2), pFC->GetSharedLength()); @@ -407,7 +431,8 @@ void Test::testSharedFormulasRefUpdate() // B1:B3 should be now grouped. pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(3), pFC->GetSharedLength()); @@ -573,22 +598,28 @@ void Test::testSharedFormulasRefUpdateRange() // B3:B5 should be shared. const ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(1,2,0)); - CPPUNIT_ASSERT_MESSAGE("B3 should be shared.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B3 should be shared.", pFC); + CPPUNIT_ASSERT_MESSAGE("B3 should be shared.", pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,3,0)); - CPPUNIT_ASSERT_MESSAGE("B4 should be shared.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B4 should be shared.", pFC); + CPPUNIT_ASSERT_MESSAGE("B4 should be shared.", pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,4,0)); - CPPUNIT_ASSERT_MESSAGE("B3 should be shared.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B3 should be shared.", pFC); + CPPUNIT_ASSERT_MESSAGE("B3 should be shared.", pFC->IsShared()); // Insert 2 rows at row 1. m_pDoc->InsertRow(ScRange(0,0,0,MAXCOL,1,0)); // B5:B7 should be shared. pFC = m_pDoc->GetFormulaCell(ScAddress(1,4,0)); - CPPUNIT_ASSERT_MESSAGE("B5 should be shared.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B5 should be shared.", pFC); + CPPUNIT_ASSERT_MESSAGE("B5 should be shared.", pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,5,0)); - CPPUNIT_ASSERT_MESSAGE("B6 should be shared.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B6 should be shared.", pFC); + CPPUNIT_ASSERT_MESSAGE("B6 should be shared.", pFC->IsShared()); pFC = m_pDoc->GetFormulaCell(ScAddress(1,6,0)); - CPPUNIT_ASSERT_MESSAGE("B7 should be shared.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("B7 should be shared.", pFC); + CPPUNIT_ASSERT_MESSAGE("B7 should be shared.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(4), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(3), pFC->GetSharedLength()); @@ -966,12 +997,14 @@ void Test::testSharedFormulasDeleteRows() // B1:B10 should be shared. const ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(10), pFC->GetSharedLength()); // B11:B20 should be shared. pFC = m_pDoc->GetFormulaCell(ScAddress(1,10,0)); - CPPUNIT_ASSERT_MESSAGE("1,10 must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("1,10 must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("1,10 must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(10), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(10), pFC->GetSharedLength()); @@ -980,12 +1013,14 @@ void Test::testSharedFormulasDeleteRows() // B1:B8 should be shared. pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedLength()); // B9:B16 should be shared. pFC = m_pDoc->GetFormulaCell(ScAddress(1,8,0)); - CPPUNIT_ASSERT_MESSAGE("1,8 must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("1,8 must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("1,8 must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedLength()); @@ -994,12 +1029,14 @@ void Test::testSharedFormulasDeleteRows() // B1:B7 should be shared. pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(7), pFC->GetSharedLength()); // B8:B15 should be shared. pFC = m_pDoc->GetFormulaCell(ScAddress(1,7,0)); - CPPUNIT_ASSERT_MESSAGE("1,7 must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("1,7 must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("1,7 must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(7), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedLength()); @@ -1008,12 +1045,14 @@ void Test::testSharedFormulasDeleteRows() // B1:B6 should be shared. pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); - CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("1,0 must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(6), pFC->GetSharedLength()); // B7:B14 should be shared. pFC = m_pDoc->GetFormulaCell(ScAddress(1,6,0)); - CPPUNIT_ASSERT_MESSAGE("1,6 must be a shared formula cell.", pFC && pFC->IsShared()); + CPPUNIT_ASSERT_MESSAGE("1,6 must be a shared formula cell.", pFC); + CPPUNIT_ASSERT_MESSAGE("1,6 must be a shared formula cell.", pFC->IsShared()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(6), pFC->GetSharedTopRow()); CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(8), pFC->GetSharedLength()); } @@ -1044,7 +1083,8 @@ void Test::testSharedFormulasDeleteColumns() const ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0)); CPPUNIT_ASSERT(pFC); const ScTokenArray* pCode = pFC->GetCode(); - CPPUNIT_ASSERT(pCode && pCode->GetLen() == 1); + CPPUNIT_ASSERT(pCode); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pCode->GetLen()); const FormulaToken* pToken = pCode->GetArray()[0]; CPPUNIT_ASSERT_EQUAL(svSingleRef, pToken->GetType()); const ScSingleRefData* pSRef = pToken->GetSingleRef(); diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index e4bf1d4d2c63..7a2056e2295d 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -217,8 +217,8 @@ void SdImportTestSmartArt::testBase() CPPUNIT_ASSERT(xShape4->getPosition().Y > xShape2->getPosition().Y); CPPUNIT_ASSERT(xShape0->getPosition().X < xShape1->getPosition().X); CPPUNIT_ASSERT(xShape2->getPosition().X < xShape3->getPosition().X); - CPPUNIT_ASSERT((xShape2->getPosition().X < xShape4->getPosition().X) - && (xShape3->getPosition().X > xShape4->getPosition().X)); + CPPUNIT_ASSERT((xShape2->getPosition().X < xShape4->getPosition().X)); + CPPUNIT_ASSERT((xShape3->getPosition().X > xShape4->getPosition().X)); xDocShRef->DoClose(); } @@ -487,8 +487,8 @@ void SdImportTestSmartArt::testChevron() uno::Reference<drawing::XShape> xShape1(xShapeGroup->getByIndex(2), uno::UNO_QUERY_THROW); uno::Reference<drawing::XShape> xShape2(xShapeGroup->getByIndex(3), uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT(xShape0->getPosition().X < xShape1->getPosition().X - && xShape1->getPosition().X < xShape2->getPosition().X); + CPPUNIT_ASSERT(xShape0->getPosition().X < xShape1->getPosition().X); + CPPUNIT_ASSERT(xShape1->getPosition().X < xShape2->getPosition().X); CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y, xShape1->getPosition().Y); CPPUNIT_ASSERT_EQUAL(xShape1->getPosition().Y, xShape2->getPosition().Y); @@ -517,8 +517,8 @@ void SdImportTestSmartArt::testCycle() // xShapeConn is connector between shapes 0 and 2 // it should lay between them and be rotated 0 -> 2 CPPUNIT_ASSERT(xShape0->getPosition().X < xShapeConn->getPosition().X); - CPPUNIT_ASSERT(xShape0->getPosition().Y < xShapeConn->getPosition().Y - && xShapeConn->getPosition().Y < xShape2->getPosition().Y); + CPPUNIT_ASSERT(xShape0->getPosition().Y < xShapeConn->getPosition().Y); + CPPUNIT_ASSERT(xShapeConn->getPosition().Y < xShape2->getPosition().Y); uno::Reference<beans::XPropertySet> xPropSetConn(xShapeConn, uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(32400), xPropSetConn->getPropertyValue("RotateAngle").get<sal_Int32>()); @@ -636,8 +636,8 @@ void SdImportTestSmartArt::testBaseRtoL() CPPUNIT_ASSERT(xShape4->getPosition().Y > xShape2->getPosition().Y); CPPUNIT_ASSERT(xShape0->getPosition().X > xShape1->getPosition().X); CPPUNIT_ASSERT(xShape2->getPosition().X > xShape3->getPosition().X); - CPPUNIT_ASSERT((xShape2->getPosition().X > xShape4->getPosition().X) - && (xShape3->getPosition().X < xShape4->getPosition().X)); + CPPUNIT_ASSERT((xShape2->getPosition().X > xShape4->getPosition().X)); + CPPUNIT_ASSERT((xShape3->getPosition().X < xShape4->getPosition().X)); xDocShRef->DoClose(); } diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index fca399a360a8..8dc23c0295a3 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -865,12 +865,14 @@ void SdMiscTest::testTdf129898LayerDrawnInSlideshow() SdrLayerAdmin& rLayerAdmin = xDocShRef->GetDoc()->GetLayerAdmin(); SdrLayer* pLayer = rLayerAdmin.GetLayer(sName); CPPUNIT_ASSERT_MESSAGE("No layer DrawnInSlideshow", pLayer); - CPPUNIT_ASSERT(pLayer->IsVisibleODF() && pLayer->IsPrintableODF()); + CPPUNIT_ASSERT(pLayer->IsVisibleODF()); + CPPUNIT_ASSERT(pLayer->IsPrintableODF()); // Verify view sd::DrawViewShell* pViewShell = static_cast<sd::DrawViewShell*>(xDocShRef->GetViewShell()); SdrPageView* pPageView = pViewShell->GetView()->GetSdrPageView(); - CPPUNIT_ASSERT(pPageView->IsLayerVisible(sName) && pPageView->IsLayerPrintable(sName)); + CPPUNIT_ASSERT(pPageView->IsLayerVisible(sName)); + CPPUNIT_ASSERT(pPageView->IsLayerPrintable(sName)); xDocShRef->DoClose(); } diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 0865224a7684..6caa07cb2354 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -86,9 +86,12 @@ namespace CPPUNIT_ASSERT_MESSAGE( "endPage() called", m_bPageEnded ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", sal_Int32(1), m_nNumPages ); CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box", - rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) && - rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) && - rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && + rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) ); + CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box", + rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) ); + CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box", + rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) ); + CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box", rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", OUString("http://download.openoffice.org/"), m_aURI ); diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 7508d467a7ac..459f635d0056 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -154,7 +154,9 @@ void MetadatableTest::test() m4.EnsureMetadataReference(); // new! beans::StringPair m4id(m4.GetMetadataReference()); CPPUNIT_ASSERT_MESSAGE("ensure on duplicate", - !m4id.Second.isEmpty() && !(m4id == id1)); + !m4id.Second.isEmpty()); + CPPUNIT_ASSERT_MESSAGE("ensure on duplicate", + !(m4id == id1)); MockMetadatable mc1(*pRegClip, true); // in clipboard MockMetadatable mc2(*pRegClip, true); diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx index 592a7a1cf0f5..ce8b7c8c8307 100644 --- a/sot/qa/cppunit/test_sot.cxx +++ b/sot/qa/cppunit/test_sot.cxx @@ -145,10 +145,14 @@ namespace SvFileStream aStream(aURL, StreamMode::READ); tools::SvRef<SotStorage> xObjStor = new SotStorage(aStream); CPPUNIT_ASSERT_MESSAGE("sot storage failed to open", - xObjStor.is() && !xObjStor->GetError()); + xObjStor.is()); + CPPUNIT_ASSERT_MESSAGE("sot storage failed to open", + !xObjStor->GetError()); tools::SvRef<SotStorageStream> xStream = xObjStor->OpenSotStream("Book"); CPPUNIT_ASSERT_MESSAGE("stream failed to open", - xStream.is() && !xObjStor->GetError()); + xStream.is()); + CPPUNIT_ASSERT_MESSAGE("stream failed to open", + !xObjStor->GetError()); CPPUNIT_ASSERT_MESSAGE("error in opened stream", !xStream->GetError()); sal_uLong nPos = xStream->GetSize(); CPPUNIT_ASSERT_EQUAL_MESSAGE("odd stream length", static_cast<sal_uLong>(13312), nPos); diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index c9e6f2c35663..480796aaddd4 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -237,22 +237,30 @@ void Test::editFailure() const SmErrorDesc *pErrorDesc = m_xDocShRef->GetParser().NextError(); CPPUNIT_ASSERT_MESSAGE("Should be a SmParseError::ColorExpected", - pErrorDesc && pErrorDesc->m_eType == SmParseError::ColorExpected); + pErrorDesc); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be a SmParseError::ColorExpected", + SmParseError::ColorExpected, pErrorDesc->m_eType); pErrorDesc = m_xDocShRef->GetParser().PrevError(); CPPUNIT_ASSERT_MESSAGE("Should be a SmParseError::UnexpectedChar", - pErrorDesc && pErrorDesc->m_eType == SmParseError::UnexpectedChar); + pErrorDesc); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be a SmParseError::UnexpectedChar", + SmParseError::UnexpectedChar, pErrorDesc->m_eType); pErrorDesc = m_xDocShRef->GetParser().PrevError(); CPPUNIT_ASSERT_MESSAGE("Should be a SmParseError::RgroupExpected", - pErrorDesc && pErrorDesc->m_eType == SmParseError::RgroupExpected); + pErrorDesc); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be a SmParseError::RgroupExpected", + SmParseError::RgroupExpected, pErrorDesc->m_eType); const SmErrorDesc *pLastErrorDesc = m_xDocShRef->GetParser().PrevError(); CPPUNIT_ASSERT_MESSAGE("Should be three syntax errors", - pLastErrorDesc && pLastErrorDesc == pErrorDesc); + pLastErrorDesc); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should be three syntax errors", + pErrorDesc, pLastErrorDesc); } void Test::ParseErrorUnexpectedToken() diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index da966596e398..2bb32137bd0b 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -346,7 +346,8 @@ void Test::testSharedStringPool() // Test case insensitive string ID's. p1 = aPool.intern(aAndy); p2 = aPool.intern("andy"); - CPPUNIT_ASSERT_MESSAGE("Failed to intern strings.", p1.getData() && p2.getData()); + CPPUNIT_ASSERT_MESSAGE("Failed to intern strings.", p1.getData()); + CPPUNIT_ASSERT_MESSAGE("Failed to intern strings.", p2.getData()); CPPUNIT_ASSERT_MESSAGE("These two ID's should differ.", p1.getData() != p2.getData()); CPPUNIT_ASSERT_EQUAL_MESSAGE("These two ID's should be equal.", p2.getDataIgnoreCase(), p1.getDataIgnoreCase()); p2 = aPool.intern("ANDY"); diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx index ea70a74aaccb..24c09a493d26 100644 --- a/sw/qa/core/Test-BigPtrArray.cxx +++ b/sw/qa/core/Test-BigPtrArray.cxx @@ -142,10 +142,15 @@ public: bparr.Insert(new BigPtrEntryMock(NUM_ENTRIES), bparr.Count() / 2); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "test_insert_entries_in_the_middle failed", + oldCount + 1, bparr.Count() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "test_insert_entries_in_the_middle failed", - (oldCount + 1 == bparr.Count() && static_cast<BigPtrEntryMock*>(bparr[bparr.Count() / 2])->getCount() == NUM_ENTRIES) + NUM_ENTRIES, static_cast<BigPtrEntryMock*>(bparr[bparr.Count() / 2])->getCount() ); CPPUNIT_ASSERT_MESSAGE @@ -204,10 +209,15 @@ public: sal_uLong oldCount = bparr.Count(); bparr.Insert(new BigPtrEntryMock(NUM_ENTRIES), bparr.Count()); - CPPUNIT_ASSERT_MESSAGE + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + "test_insert_at_end failed", + oldCount + 1, bparr.Count() + ); + CPPUNIT_ASSERT_EQUAL_MESSAGE ( "test_insert_at_end failed", - (oldCount + 1 == bparr.Count() && static_cast<BigPtrEntryMock*>(bparr[bparr.Count()-1])->getCount() == NUM_ENTRIES) + NUM_ENTRIES, static_cast<BigPtrEntryMock*>(bparr[bparr.Count()-1])->getCount() ); CPPUNIT_ASSERT_MESSAGE diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index ee394002e115..5c872bb5ebf5 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -837,72 +837,72 @@ void SwDocTest::testSwScanner() m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', ' ')); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 4 && - aDocStat.nCharExcludingSpaces == 12 && - aDocStat.nChar == 15); + CPPUNIT_ASSERT_EQUAL(sal_uLong(4), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(12), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(15), aDocStat.nChar); aDocStat.Reset(); m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint()); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll("X", " = ")); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 5 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 17); + CPPUNIT_ASSERT_EQUAL(sal_uLong(5), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(17), aDocStat.nChar); aDocStat.Reset(); m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint()); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll("X", " _ ")); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 5 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 17); + CPPUNIT_ASSERT_EQUAL(sal_uLong(5), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(17), aDocStat.nChar); aDocStat.Reset(); m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint()); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll("X", " -- ")); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 5 && - aDocStat.nCharExcludingSpaces == 14 && - aDocStat.nChar == 18); + CPPUNIT_ASSERT_EQUAL(sal_uLong(5), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(14), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(18), aDocStat.nChar); aDocStat.Reset(); m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint()); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', '_')); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 3 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 15); + CPPUNIT_ASSERT_EQUAL(sal_uLong(3), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(15), aDocStat.nChar); aDocStat.Reset(); m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint()); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', '-')); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 3 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 15); + CPPUNIT_ASSERT_EQUAL(sal_uLong(3), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(15), aDocStat.nChar); aDocStat.Reset(); m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint()); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2012)); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 3 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 15); + CPPUNIT_ASSERT_EQUAL(sal_uLong(3), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(15), aDocStat.nChar); aDocStat.Reset(); m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint()); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2015)); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 3 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 15); + CPPUNIT_ASSERT_EQUAL(sal_uLong(3), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(15), aDocStat.nChar); aDocStat.Reset(); //But default configuration should, msword-alike treat emdash @@ -911,18 +911,18 @@ void SwDocTest::testSwScanner() m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2013)); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 4 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 15); + CPPUNIT_ASSERT_EQUAL(sal_uLong(4), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(15), aDocStat.nChar); aDocStat.Reset(); m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint()); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2014)); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 4 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 15); + CPPUNIT_ASSERT_EQUAL(sal_uLong(4), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(15), aDocStat.nChar); aDocStat.Reset(); static constexpr OUStringLiteral sChunk = u" \u2013 "; @@ -930,9 +930,9 @@ void SwDocTest::testSwScanner() m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll("X", sChunk)); pTextNode = aPaM.GetNode().GetTextNode(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); - CPPUNIT_ASSERT(aDocStat.nWord == 4 && - aDocStat.nCharExcludingSpaces == 13 && - aDocStat.nChar == 17); + CPPUNIT_ASSERT_EQUAL(sal_uLong(4), aDocStat.nWord); + CPPUNIT_ASSERT_EQUAL(sal_uLong(13), aDocStat.nCharExcludingSpaces); + CPPUNIT_ASSERT_EQUAL(sal_uLong(17), aDocStat.nChar); aDocStat.Reset(); } } @@ -1578,11 +1578,15 @@ void SwDocTest::testFormulas() // tdf#61228: Evaluating non-defined function should return an error SwCalc aCalc(*m_pDoc); SwSbxValue val = aCalc.Calculate("foobar()"); - CPPUNIT_ASSERT(aCalc.IsCalcError() && val.IsVoidValue() && val.IsDouble()); + CPPUNIT_ASSERT(aCalc.IsCalcError()); + CPPUNIT_ASSERT(val.IsVoidValue()); + CPPUNIT_ASSERT(val.IsDouble()); CPPUNIT_ASSERT_EQUAL(DBL_MAX, val.GetDouble()); // Evaluating non-defined variable should return 0 without an error val = aCalc.Calculate("foobar"); - CPPUNIT_ASSERT(!aCalc.IsCalcError() && val.IsVoidValue() && val.IsLong()); + CPPUNIT_ASSERT(!aCalc.IsCalcError()); + CPPUNIT_ASSERT(val.IsVoidValue()); + CPPUNIT_ASSERT(val.IsLong()); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), val.GetLong()); } diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index 7ed0094924a0..d3c3f247f01a 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -699,12 +699,14 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf126244) = getXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/font[5]", "orientation") .toInt32(); - CPPUNIT_ASSERT(nRotation >= 899 && nRotation <= 900); + CPPUNIT_ASSERT(nRotation >= 899); + CPPUNIT_ASSERT(nRotation <= 900); // Test the third level of vertical category axis labels orientation. The third level orientation should be vertical. nRotation = getXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/font[7]", "orientation") .toInt32(); - CPPUNIT_ASSERT(nRotation >= 899 && nRotation <= 900); + CPPUNIT_ASSERT(nRotation >= 899); + CPPUNIT_ASSERT(nRotation <= 900); } CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf127304) @@ -722,7 +724,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf127304) = getXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[3]/push[1]/font[1]", "orientation") .toInt32(); - CPPUNIT_ASSERT(nRotation >= 899 && nRotation <= 900); + CPPUNIT_ASSERT(nRotation >= 899); + CPPUNIT_ASSERT(nRotation <= 900); // Test the second level of horizontal category axis labels orientation. The second level orientation should be horizontal. assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/push[3]/push[1]/font[5]", "orientation", "0"); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index c191713a7be9..78c12d93a4ff 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -866,8 +866,10 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125657, "tdf125657.docx") // Only decimal characters allowed, optionally prepended with '-'; no '.' CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(), sAttr[0] == '-' || (sAttr[0] >= '0' && sAttr[0] <= '9')); - for (sal_Int32 i = 1; i < sAttr.getLength(); ++i) - CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(), sAttr[i] >= '0' && sAttr[i] <= '9'); + for (sal_Int32 i = 1; i < sAttr.getLength(); ++i) { + CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(), sAttr[i] >= '0'); + CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(), sAttr[i] <= '9'); + } }; // check that we export all coordinates of srcRect as integers checkAttrIsInt("l"); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index 5d973cc0551e..d115f6f5741e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -486,7 +486,12 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx") CPPUNIT_ASSERT(aDrawingDom); // Reference not empty } } - CPPUNIT_ASSERT(bData && bLayout && bQStyle && bColor && bDrawing); // Grab Bag has all the expected elements + // Grab Bag has all the expected elements: + CPPUNIT_ASSERT(bData); + CPPUNIT_ASSERT(bLayout); + CPPUNIT_ASSERT(bQStyle); + CPPUNIT_ASSERT(bColor); + CPPUNIT_ASSERT(bDrawing); uno::Reference<beans::XPropertySet> xPropertySet(xGroup->getByIndex(0), uno::UNO_QUERY); OUString nValue; @@ -773,13 +778,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf41542_imagePadding, "tdf41542_imagePadding.odt") CPPUNIT_ASSERT_EQUAL(1, getPages()); // borderlessImage - image WITHOUT BORDERS : simulate padding with -crop text::GraphicCrop crop = getProperty<text::GraphicCrop>(getShape(2), "GraphicCrop"); - CPPUNIT_ASSERT( crop.Left != 0 && crop.Right != 0 ); - CPPUNIT_ASSERT( crop.Left == crop.Top && crop.Right == crop.Bottom && crop.Left == crop.Right); + CPPUNIT_ASSERT( crop.Left != 0 ); + CPPUNIT_ASSERT( crop.Right != 0 ); + CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Top); + CPPUNIT_ASSERT_EQUAL( crop.Right, crop.Bottom); + CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Right); // borderedImage - image WITH BORDERS : simulate padding with -crop crop = getProperty<text::GraphicCrop>(getShape(3), "GraphicCrop"); - CPPUNIT_ASSERT( crop.Left != 0 && crop.Right != 0 ); - CPPUNIT_ASSERT( crop.Left == crop.Top && crop.Right == crop.Bottom && crop.Left == crop.Right); + CPPUNIT_ASSERT( crop.Left != 0 ); + CPPUNIT_ASSERT( crop.Right != 0 ); + CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Top); + CPPUNIT_ASSERT_EQUAL( crop.Right, crop.Bottom); + CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Right); } DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFootnoteParagraphTag, "testFootnote.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index e9d8ebd64fd7..54540c265977 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -1069,7 +1069,8 @@ DECLARE_OOXMLEXPORT_TEST(testTDF87348, "tdf87348_linkedTextboxes.docx") //that means 9 NEXT links and 9 PREV links. //however, the current implementation adds leftover shapes, so can't go on exact numbers // (unknown number of flys, unknown order of leftovers) - CPPUNIT_ASSERT ( (followCount >= 6) && (precedeCount >= 6) ); + CPPUNIT_ASSERT ( (followCount >= 6) ); + CPPUNIT_ASSERT ( (precedeCount >= 6) ); } #endif diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx b/sw/qa/extras/rtfexport/rtfexport3.cxx index 696e6add4c3b..3aed69335c44 100644 --- a/sw/qa/extras/rtfexport/rtfexport3.cxx +++ b/sw/qa/extras/rtfexport/rtfexport3.cxx @@ -157,10 +157,12 @@ DECLARE_RTFEXPORT_TEST(testTdf115180, "tdf115180.docx") CPPUNIT_ASSERT_EQUAL_MESSAGE("Row width", sal_Int32(9360), rowWidth); sal_Int32 cell1Width = parseDump("/root/page/body/tab/row/cell[1]/infos/bounds", "width").toInt32(); - CPPUNIT_ASSERT_MESSAGE("First cell width", cell1Width >= 9140 && cell1Width <= 9142); + CPPUNIT_ASSERT_MESSAGE("First cell width", cell1Width >= 9140); + CPPUNIT_ASSERT_MESSAGE("First cell width", cell1Width <= 9142); sal_Int32 cell2Width = parseDump("/root/page/body/tab/row/cell[2]/infos/bounds", "width").toInt32(); - CPPUNIT_ASSERT_MESSAGE("Second cell width", cell2Width >= 218 && cell2Width <= 220); + CPPUNIT_ASSERT_MESSAGE("Second cell width", cell2Width >= 218); + CPPUNIT_ASSERT_MESSAGE("Second cell width", cell2Width <= 220); } DECLARE_ODFEXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.rtf") diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index d7d60e5dec69..5477e3e24a36 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -1090,8 +1090,10 @@ void SwTiledRenderingTest::testShapeViewCursors() // Make sure that aView1 gets a view-only cursor notification, while // aView2 gets a real cursor notification. CPPUNIT_ASSERT_EQUAL(aView1.m_aOwnCursor, aLastOwnCursor1); - CPPUNIT_ASSERT(aView1.m_bViewCursorInvalidated && aLastViewCursor1 != aView1.m_aViewCursor); - CPPUNIT_ASSERT(aView2.m_bOwnCursorInvalidated && aLastOwnCursor2 != aView2.m_aOwnCursor); + CPPUNIT_ASSERT(aView1.m_bViewCursorInvalidated); + CPPUNIT_ASSERT(aLastViewCursor1 != aView1.m_aViewCursor); + CPPUNIT_ASSERT(aView2.m_bOwnCursorInvalidated); + CPPUNIT_ASSERT(aLastOwnCursor2 != aView2.m_aOwnCursor); CPPUNIT_ASSERT_EQUAL(aLastViewCursor2, aView2.m_aViewCursor); } @@ -1940,7 +1942,8 @@ void SwTiledRenderingTest::testAllTrackedChanges() int nView1 = SfxLokHelper::getView(); int nView2 = SfxLokHelper::createView(); SwView* pView2 = dynamic_cast<SwView*>(SfxViewShell::Current()); - CPPUNIT_ASSERT(pView2 && pView1 != pView2); + CPPUNIT_ASSERT(pView2); + CPPUNIT_ASSERT(pView1 != pView2); SwWrtShell* pWrtShell2 = pView2->GetWrtShellPtr(); // Insert text and reject all { diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 7d24e652d694..f426d0fd1eb5 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -1929,7 +1929,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf122942) SdrObject* pObject2 = rFormats2[1]->FindSdrObject(); CPPUNIT_ASSERT(pObject2); const tools::Rectangle& rOutRect2 = pObject2->GetLastBoundRect(); - CPPUNIT_ASSERT(rOutRect2.Top() > rOutRect1.Top() && rOutRect2.Top() < rOutRect1.Bottom()); + CPPUNIT_ASSERT(rOutRect2.Top() > rOutRect1.Top()); + CPPUNIT_ASSERT(rOutRect2.Top() < rOutRect1.Bottom()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf132160) @@ -2682,9 +2683,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testDocxAttributeTableExport) // test the new values sal_Int32 nValue = getProperty<sal_Int32>(xShape, "VertOrientPosition"); - CPPUNIT_ASSERT(sal_Int32(7999) <= nValue && nValue <= sal_Int32(8001)); + CPPUNIT_ASSERT(sal_Int32(7999) <= nValue); + CPPUNIT_ASSERT(nValue <= sal_Int32(8001)); nValue = getProperty<sal_Int32>(xShape, "HoriOrientPosition"); - CPPUNIT_ASSERT(sal_Int32(4999) <= nValue && nValue <= sal_Int32(5001)); + CPPUNIT_ASSERT(sal_Int32(4999) <= nValue); + CPPUNIT_ASSERT(nValue <= sal_Int32(5001)); CPPUNIT_ASSERT_EQUAL(sal_Int16(8), getProperty<sal_Int16>(xShape, "VertOrientRelation")); CPPUNIT_ASSERT_EQUAL(sal_Int16(0), getProperty<sal_Int16>(xShape, "HoriOrientRelation")); diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 333b26b5230e..be85611d18e3 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -1027,13 +1027,19 @@ DECLARE_WW8EXPORT_TEST(testTdf41542_imagePadding, "tdf41542_imagePadding.odt") CPPUNIT_ASSERT_EQUAL(1, getPages()); // borderlessImage - image WITHOUT BORDERS : simulate padding with -crop text::GraphicCrop crop = getProperty<text::GraphicCrop>(getShape(2), "GraphicCrop"); - CPPUNIT_ASSERT( crop.Left != 0 && crop.Right != 0 ); - CPPUNIT_ASSERT( crop.Left == crop.Top && crop.Right == crop.Bottom && crop.Left == crop.Right ); + CPPUNIT_ASSERT( crop.Left != 0 ); + CPPUNIT_ASSERT( crop.Right != 0 ); + CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Top ); + CPPUNIT_ASSERT_EQUAL( crop.Right, crop.Bottom ); + CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Right ); // borderedImage - image WITH BORDERS : simulate padding with -crop crop = getProperty<text::GraphicCrop>(getShape(3), "GraphicCrop"); - CPPUNIT_ASSERT( crop.Left != 0 && crop.Right != 0 ); - CPPUNIT_ASSERT( crop.Left == crop.Top && crop.Right == crop.Bottom && crop.Left == crop.Right ); + CPPUNIT_ASSERT( crop.Left != 0 ); + CPPUNIT_ASSERT( crop.Right != 0 ); + CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Top ); + CPPUNIT_ASSERT_EQUAL( crop.Right, crop.Bottom ); + CPPUNIT_ASSERT_EQUAL( crop.Left, crop.Right ); } DECLARE_WW8EXPORT_TEST(testFdo77454, "fdo77454.doc") @@ -1528,7 +1534,8 @@ DECLARE_WW8EXPORT_TEST(testTdf94386, "tdf94386.odt") awt::Size lSize; xNextPropertySet->getPropertyValue("Size") >>= lSize; - CPPUNIT_ASSERT((fSize.Width != lSize.Width) && (fSize.Height != lSize.Height)); + CPPUNIT_ASSERT((fSize.Width != lSize.Width)); + CPPUNIT_ASSERT((fSize.Height != lSize.Height)); } DECLARE_WW8EXPORT_TEST(testTdf99474, "tdf99474.odt") diff --git a/sw/qa/uitest/writer_tests7/tdf139301.py b/sw/qa/uitest/writer_tests7/tdf139301.py index 6064528bf166..caca09fa9281 100644 --- a/sw/qa/uitest/writer_tests7/tdf139301.py +++ b/sw/qa/uitest/writer_tests7/tdf139301.py @@ -6,6 +6,7 @@ # from uitest.framework import UITestCase from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file +import time class tdf139301(UITestCase): @@ -22,12 +23,16 @@ class tdf139301(UITestCase): # wait for available line style setting self.ui_test.wait_until_child_is_available(xWriterEdit, 'metricfield') + time.sleep(1) # line setting dialog window self.ui_test.execute_dialog_through_command(".uno:FormatLine") + time.sleep(1) xFormatLineDlg = self.xUITest.getTopFocusWindow() + time.sleep(1) # get line style combo box xLineStyle = xFormatLineDlg.getChild("LB_LINE_STYLE") + time.sleep(1) # preset line style style = get_state_as_dict(xLineStyle)['SelectEntryText'] diff --git a/test/source/sheet/xdocumentauditing.cxx b/test/source/sheet/xdocumentauditing.cxx index acbab0968397..3a08fdb2e729 100644 --- a/test/source/sheet/xdocumentauditing.cxx +++ b/test/source/sheet/xdocumentauditing.cxx @@ -122,8 +122,8 @@ void XDocumentAuditing::testRefreshArrows() CPPUNIT_ASSERT_MESSAGE("Wrong amount of shapes on page", bResult); awt::Point Position1 = m_Position; - CPPUNIT_ASSERT_MESSAGE("Arrow has been refreshed", - Position0.X == Position1.X && Position0.Y == Position1.Y); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Arrow has been refreshed", Position0.X, Position1.X); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Arrow has been refreshed", Position0.Y, Position1.Y); xDocumentAuditing->refreshArrows(); diff --git a/test/source/table/xcell.cxx b/test/source/table/xcell.cxx index 921ef78bad83..8540117a5618 100644 --- a/test/source/table/xcell.cxx +++ b/test/source/table/xcell.cxx @@ -28,8 +28,8 @@ void XCell::testGetError() xCell->setFormula("=sqrt(-2)"); const sal_Int32 nIncorrectFormula = xCell->getError(); - CPPUNIT_ASSERT_MESSAGE("Successfully able to get Error", - (nCorrectFormula == 0) && (nIncorrectFormula != 0)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Successfully able to get Error", sal_Int32(0), nCorrectFormula); + CPPUNIT_ASSERT_MESSAGE("Successfully able to get Error", (nIncorrectFormula != 0)); } void XCell::testGetType() diff --git a/test/source/table/xcellcursor.cxx b/test/source/table/xcellcursor.cxx index a8e7b2be5728..f564cb5874bc 100644 --- a/test/source/table/xcellcursor.cxx +++ b/test/source/table/xcellcursor.cxx @@ -95,8 +95,8 @@ void XCellCursor::testGoToStart() const sal_Int32 startCol = aCellRangeAddr.StartColumn; const sal_Int32 endRow = aCellRangeAddr.EndRow; const sal_Int32 endCol = aCellRangeAddr.EndColumn; - CPPUNIT_ASSERT_MESSAGE("Successfully able to got to Start", - (startCol == endCol) && (endRow == startRow)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Successfully able to got to Start", startCol, endCol); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Successfully able to got to Start", endRow, startRow); } void XCellCursor::testGoToEnd() @@ -118,8 +118,8 @@ void XCellCursor::testGoToEnd() const sal_Int32 startCol = aCellRangeAddr.StartColumn; const sal_Int32 endRow = aCellRangeAddr.EndRow; const sal_Int32 endCol = aCellRangeAddr.EndColumn; - CPPUNIT_ASSERT_MESSAGE("Successfully able to go to End", - (startCol == endCol) && (endRow == startRow)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Successfully able to go to End", startCol, endCol); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Successfully able to go to End", endRow, startRow); } } diff --git a/toolkit/qa/cppunit/UnitConversion.cxx b/toolkit/qa/cppunit/UnitConversion.cxx index 342eaf18c21e..5e28667f5a8e 100644 --- a/toolkit/qa/cppunit/UnitConversion.cxx +++ b/toolkit/qa/cppunit/UnitConversion.cxx @@ -198,8 +198,10 @@ void ToolkitTest::testXUnitConversion() std::cerr << "Height: " << aNewSize.Height << " pixel\n"; // assure the pixels are the same as we already know - CPPUNIT_ASSERT_MESSAGE("failed: Size from pixel to 1/100mm to pixel", - aSize.Width == aNewSize.Width && aSize.Height == aNewSize.Height); + CPPUNIT_ASSERT_EQUAL_MESSAGE("failed: Size from pixel to 1/100mm to pixel", aNewSize.Width, + aSize.Width); + CPPUNIT_ASSERT_EQUAL_MESSAGE("failed: Size from pixel to 1/100mm to pixel", aNewSize.Height, + aSize.Height); // close the window. xWindow->dispose(); diff --git a/tools/qa/cppunit/test_fract.cxx b/tools/qa/cppunit/test_fract.cxx index 897533d645fd..1c3b8ad02986 100644 --- a/tools/qa/cppunit/test_fract.cxx +++ b/tools/qa/cppunit/test_fract.cxx @@ -39,38 +39,45 @@ public: Fraction aFract2( aFract ); aFract2.ReduceInaccurate(8); - CPPUNIT_ASSERT_MESSAGE( "Fraction #2 not 1", - aFract2.GetNumerator() == 1 && - aFract2.GetDenominator() == 1 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #2 not 1", + sal_Int32(1), aFract2.GetNumerator() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #2 not 1", + sal_Int32(1), aFract2.GetDenominator() ); Fraction aFract3( 0x7AAAAAAA, 0x35555555 ); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 cancellation wrong", - aFract3.GetNumerator() == 0x7AAAAAAA && - aFract3.GetDenominator() == 0x35555555 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 cancellation wrong", + sal_Int32(0x7AAAAAAA), aFract3.GetNumerator() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 cancellation wrong", + sal_Int32(0x35555555), aFract3.GetDenominator() ); aFract3.ReduceInaccurate(30); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 ReduceInaccurate erroneously cut precision", - aFract3.GetNumerator() == 0x7AAAAAAA && - aFract3.GetDenominator() == 0x35555555 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 ReduceInaccurate erroneously cut precision", + sal_Int32(0x7AAAAAAA), aFract3.GetNumerator() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 ReduceInaccurate erroneously cut precision", + sal_Int32(0x35555555), aFract3.GetDenominator() ); aFract3.ReduceInaccurate(29); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 29 bits failed", - aFract3.GetNumerator() == 0x3D555555 && - aFract3.GetDenominator() == 0x1AAAAAAA ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 reduce to 29 bits failed", + sal_Int32(0x3D555555), aFract3.GetNumerator() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 reduce to 29 bits failed", + sal_Int32(0x1AAAAAAA), aFract3.GetDenominator() ); aFract3.ReduceInaccurate(9); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 9 bits failed", - aFract3.GetNumerator() == 0x0147 && - aFract3.GetDenominator() == 0x008E ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 reduce to 9 bits failed", + sal_Int32(0x0147), aFract3.GetNumerator() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 reduce to 9 bits failed", + sal_Int32(0x008E), aFract3.GetDenominator() ); aFract3.ReduceInaccurate(1); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 1 bit failed", - aFract3.GetNumerator() == 2 && - aFract3.GetDenominator() == 1 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 reduce to 1 bit failed", + sal_Int32(2), aFract3.GetNumerator() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 reduce to 1 bit failed", + sal_Int32(1), aFract3.GetDenominator() ); aFract3.ReduceInaccurate(0); - CPPUNIT_ASSERT_MESSAGE( "Fraction #3 reduce to 0 bits failed", - aFract3.GetNumerator() == 2 && - aFract3.GetDenominator() == 1 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 reduce to 0 bits failed", + sal_Int32(2), aFract3.GetNumerator() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Fraction #3 reduce to 0 bits failed", + sal_Int32(1), aFract3.GetDenominator() ); } diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index d8e4d1ef71e1..4672af6c70c9 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -230,14 +230,16 @@ namespace aMemStream.Seek(0); bRet = aMemStream.ReadLine(aFoo); CPPUNIT_ASSERT(bRet); - CPPUNIT_ASSERT(aFoo.getLength() == 7 && aFoo[3] == 0); + CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aFoo.getLength()); + CPPUNIT_ASSERT_EQUAL('\0', aFoo[3]); CPPUNIT_ASSERT(aMemStream.good()); std::string sStr(foo, RTL_CONSTASCII_LENGTH(foo)); std::istringstream iss(sStr, std::istringstream::in); std::getline(iss, sStr, '\n'); //embedded null read as expected - CPPUNIT_ASSERT(sStr.size() == 7 && sStr[3] == 0); + CPPUNIT_ASSERT_EQUAL(std::string::size_type(7), sStr.size()); + CPPUNIT_ASSERT_EQUAL('\0', sStr[3]); CPPUNIT_ASSERT(iss.good()); bRet = aMemStream.ReadLine(aFoo); @@ -252,11 +254,13 @@ namespace bRet = aMemStream.ReadLine(aFoo); CPPUNIT_ASSERT(!bRet); CPPUNIT_ASSERT(aFoo.isEmpty()); - CPPUNIT_ASSERT(aMemStream.eof() && !aMemStream.bad()); + CPPUNIT_ASSERT(aMemStream.eof()); + CPPUNIT_ASSERT(!aMemStream.bad()); std::getline(iss, sStr, '\n'); CPPUNIT_ASSERT(sStr.empty()); - CPPUNIT_ASSERT(iss.eof() && !iss.bad()); + CPPUNIT_ASSERT(iss.eof()); + CPPUNIT_ASSERT(!iss.bad()); char bar[] = "foo"; SvMemoryStream aMemStreamB(bar, SAL_N_ELEMENTS(bar)-1, StreamMode::READ); diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index 67afde99d3a0..1b1daa56b1f9 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -242,7 +242,9 @@ struct BasicTest : public test::BootstrapFixture CPPUNIT_ASSERT_MESSAGE("Valid input file did not result in XDocument #2 (exception thrown)", false); } CPPUNIT_ASSERT_MESSAGE("No parse warnings in unclean input file", - mxErrHandler->mnWarnCount && !mxErrHandler->mnErrCount /*&& !mxErrHandler->mnFatalCount*/); + mxErrHandler->mnWarnCount); + CPPUNIT_ASSERT_MESSAGE("No parse warnings in unclean input file", + !mxErrHandler->mnErrCount /*&& !mxErrHandler->mnFatalCount*/); } void errorInputTest() @@ -261,7 +263,9 @@ struct BasicTest : public test::BootstrapFixture // It's OK to catch an exception here as we parse incorrect XML file } CPPUNIT_ASSERT_MESSAGE("No parse errors in unclean input file", - !mxErrHandler->mnWarnCount && mxErrHandler->mnErrCount /*&& !mxErrHandler->mnFatalCount*/); + !mxErrHandler->mnWarnCount); + CPPUNIT_ASSERT_MESSAGE("No parse errors in unclean input file", + mxErrHandler->mnErrCount /*&& !mxErrHandler->mnFatalCount*/); } // Change the following lines only, if you add, remove or rename diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx index bbf8a38da0f6..a4852438f6f3 100644 --- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx +++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx @@ -76,8 +76,8 @@ void BitmapRenderTest::testTdf104141() // Check drawing results: ensure that it contains transparent // (greenish) pixels const Color aColor = pVDev->GetPixel(Point(21, 21)); - CPPUNIT_ASSERT(aColor.GetGreen() > 10 * aColor.GetRed() - && aColor.GetGreen() > 10 * aColor.GetBlue()); + CPPUNIT_ASSERT(aColor.GetGreen() > 10 * aColor.GetRed()); + CPPUNIT_ASSERT(aColor.GetGreen() > 10 * aColor.GetBlue()); } void BitmapRenderTest::testTdf113918() @@ -101,7 +101,8 @@ void BitmapRenderTest::testTdf113918() // Ensure that image is drawn with gray text color from palette const Color aColor = pVDev->GetPixel(Point(1298, 1368)); - CPPUNIT_ASSERT(aColor.GetGreen() == aColor.GetRed() && aColor.GetGreen() == aColor.GetBlue()); + CPPUNIT_ASSERT_EQUAL(aColor.GetGreen(), aColor.GetRed()); + CPPUNIT_ASSERT_EQUAL(aColor.GetGreen(), aColor.GetBlue()); CPPUNIT_ASSERT(aColor.GetGreen() > 100); } diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 658444dee9f5..a26296a7b5e8 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -96,8 +96,10 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, CPPUNIT_ASSERT_EQUAL_MESSAGE( "Original bitmap size not (200,200)", Size(200,200), aContainedBmp.GetSizePixel()); - CPPUNIT_ASSERT_MESSAGE( "Original bitmap size via API not (200,200)", - xBmp->getSize().Width == 200 && xBmp->getSize().Height == 200); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Original bitmap size via API not (200,200)", + sal_Int32(200), xBmp->getSize().Width); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Original bitmap size via API not (200,200)", + sal_Int32(200), xBmp->getSize().Height); CPPUNIT_ASSERT_EQUAL_MESSAGE( "alpha state mismatch", aContainedBmpEx.IsTransparent(), bool(xBmp->hasAlpha())); @@ -168,8 +170,12 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, 0.0, pARGBStart[0].Alpha); } - CPPUNIT_ASSERT_MESSAGE( "Second pixel is not black", - pRGBStart[1].Red == 0.0 && pRGBStart[1].Green == 0.0 && pRGBStart[1].Blue == 0.0); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Second pixel is not black", + 0.0, pRGBStart[1].Red); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Second pixel is not black", + 0.0, pRGBStart[1].Green); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Second pixel is not black", + 0.0, pRGBStart[1].Blue); if( nOriginalDepth > 8 ) { @@ -347,7 +353,9 @@ private: CPPUNIT_ASSERT_MESSAGE( "Got palette getIndex interface call without handing out palette", getPalette().is() ); CPPUNIT_ASSERT_MESSAGE( "getIndex: index out of range", - nIndex >= 0 && nIndex < 256 ); + nIndex >= 0 ); + CPPUNIT_ASSERT_MESSAGE( "getIndex: index out of range", + nIndex < 256 ); entry = colorToStdColorSpaceSequence( Color(sal_uInt8(nIndex), sal_uInt8(nIndex), @@ -363,7 +371,9 @@ private: CPPUNIT_ASSERT_MESSAGE( "Got palette setIndex interface call without handing out palette", getPalette().is()); CPPUNIT_ASSERT_MESSAGE( "setIndex: index out of range", - nIndex >= 0 && nIndex < 256); + nIndex >= 0); + CPPUNIT_ASSERT_MESSAGE( "setIndex: index out of range", + nIndex < 256); return false; } diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index e25b03d279e4..6cdbbe0819d6 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -75,7 +75,10 @@ void LifecycleTest::testVirtualDevice() ScopedVclPtrInstance< VirtualDevice > pVDev2; VclPtrInstance<VirtualDevice> pVDev3; VclPtrInstance<VirtualDevice> pVDev4(DeviceFormat::BITMASK); - CPPUNIT_ASSERT(!!pVDev && !!pVDev2 && !!pVDev3 && !!pVDev4); + CPPUNIT_ASSERT(!!pVDev); + CPPUNIT_ASSERT(!!pVDev2); + CPPUNIT_ASSERT(!!pVDev3); + CPPUNIT_ASSERT(!!pVDev4); pVDev.disposeAndClear(); pVDev4.disposeAndClear(); } diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index 112e3f611b96..15493b953639 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -556,7 +556,8 @@ void TimerTest::testRoundRobin() CPPUNIT_ASSERT( nCount1 <= 3 ); CPPUNIT_ASSERT( nCount2 <= 3 ); } - CPPUNIT_ASSERT( 3 == nCount1 && 3 == nCount2 ); + CPPUNIT_ASSERT_EQUAL( sal_uInt32(3), nCount1 ); + CPPUNIT_ASSERT_EQUAL( sal_uInt32(3), nCount2 ); } CPPUNIT_TEST_SUITE_REGISTRATION(TimerTest); |