/shell/

ice-7-1+backports LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-02-08 07:48:59 +0100
committerStephan Bergmann <sbergman@redhat.com>2021-02-08 09:15:01 +0100
commit6b00d0576a310796590631d14c54d7d5ea6814ac (patch)
tree2e11a4454592be39cfeaa68458cae964d8cdef5e
parent17149f65f03a34e88bb4a10abcd20e6891f5d7ca (diff)
Improve loplugin:cppunitassertequal for CPPUNIT_ASSERT(a && b)
...by re-enabling the code temporarily #if'ed-out in a528392e71bc70136021be4e3d83732fccbb885e "Fixed/improved loplugin:cppunitassertequals" (and which then triggers lots of other lopglugin:cppunitassertequal CPPUNIT_ASSERT -> CPPUNIT_ASSERT_EQUAL warnings). For two css::uno::Reference equality comparisons in cppu/qa/test_any.cxx, it was more straightforward to rewrite them with an explicit call to operator == (which silences loplugin:cppunitassertequal) than to adapt them to CPPUNIT_ASSERT_EQUAL's requirement for arguments of identical types. In sc/qa/unit/ucalc_pivottable.cxx, ScDPItemData needs toString, which has been implemented trivially for now, but might want to combine that with the DEBUG_PIVOT_TABLE-only ScDPItemData::Dump. Change-Id: Iae6d09cf69bd4e52fe4411bba9e50c48e696291c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110546 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat
-rw-r--r--basegfx/test/B2DHomMatrixTest.cxx4
-rw-r--r--chart2/qa/extras/chart2export.cxx33
-rw-r--r--chart2/qa/extras/chart2import.cxx24
-rw-r--r--compilerplugins/clang/cppunitassertequals.cxx2
-rw-r--r--compilerplugins/clang/test/cppunitassertequals.cxx2
-rw-r--r--cppu/qa/test_any.cxx1163
-rw-r--r--desktop/qa/desktop_lib/test_desktop_lib.cxx17
-rw-r--r--editeng/qa/unit/core-test.cxx30
-rw-r--r--i18nlangtag/qa/cppunit/test_languagetag.cxx21
-rw-r--r--i18npool/qa/cppunit/test_breakiterator.cxx93
-rw-r--r--i18npool/qa/cppunit/test_characterclassification.cxx10
-rw-r--r--i18npool/qa/cppunit/test_textsearch.cxx69
-rw-r--r--sal/qa/OStringBuffer/rtl_OStringBuffer.cxx6710
-rw-r--r--sal/qa/osl/process/osl_Thread.cxx28
-rw-r--r--sal/qa/rtl/digest/rtl_digest.cxx10
-rw-r--r--sal/qa/rtl/random/rtl_random.cxx10
-rw-r--r--sal/qa/rtl/textenc/rtl_tencinfo.cxx17
-rw-r--r--sal/qa/rtl/uuid/rtl_Uuid.cxx6
-rw-r--r--sal/qa/sal/test_types.cxx3
-rw-r--r--sc/qa/unit/copy_paste_test.cxx6
-rw-r--r--sc/qa/unit/filters-test.cxx9
-rw-r--r--sc/qa/unit/mark_test.cxx9
-rw-r--r--sc/qa/unit/pivottable_filters_test.cxx241
-rw-r--r--sc/qa/unit/scshapetest.cxx6
-rw-r--r--sc/qa/unit/subsequent_export-test.cxx6
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx26
-rw-r--r--sc/qa/unit/ucalc.cxx206
-rw-r--r--sc/qa/unit/ucalc_formula.cxx45
-rw-r--r--sc/qa/unit/ucalc_pivottable.cxx160
-rw-r--r--sc/qa/unit/ucalc_sharedformula.cxx120
-rw-r--r--sd/qa/unit/import-tests-smartart.cxx16
-rw-r--r--sd/qa/unit/misc-tests.cxx6
-rw-r--r--sdext/source/pdfimport/test/tests.cxx9
-rw-r--r--sfx2/qa/cppunit/test_metadatable.cxx4
-rw-r--r--sot/qa/cppunit/test_sot.cxx8
-rw-r--r--starmath/qa/cppunit/test_starmath.cxx16
-rw-r--r--svl/qa/unit/svl.cxx3
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx18
-rw-r--r--sw/qa/core/uwriter.cxx74
-rw-r--r--sw/qa/extras/layout/layout2.cxx9
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport13.cxx6
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport3.cxx21
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport7.cxx3
-rw-r--r--sw/qa/extras/rtfexport/rtfexport3.cxx6
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx9
-rw-r--r--sw/qa/extras/uiwriter/uiwriter2.cxx9
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx17
-rw-r--r--sw/qa/uitest/writer_tests7/tdf139301.py5
-rw-r--r--test/source/sheet/xdocumentauditing.cxx4
-rw-r--r--test/source/table/xcell.cxx4
-rw-r--r--test/source/table/xcellcursor.cxx8
-rw-r--r--toolkit/qa/cppunit/UnitConversion.cxx6
-rw-r--r--tools/qa/cppunit/test_fract.cxx49
-rw-r--r--tools/qa/cppunit/test_stream.cxx12
-rw-r--r--unoxml/qa/unit/domtest.cxx8
-rw-r--r--vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx7
-rw-r--r--vcl/qa/cppunit/canvasbitmaptest.cxx22
-rw-r--r--vcl/qa/cppunit/lifecycle.cxx5
-rw-r--r--vcl/qa/cppunit/timer.cxx3
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 &