From a3f73a87f63c1adbaa29130664f9534afc198232 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Thu, 1 Nov 2012 20:30:34 -0200 Subject: [PATCH] Fix copy&paste in test Also, change CPPUNIT_ASSERT_MESSAGE to CPPUNIT_ASSERT_EuAL_MESSAGE_EQUAL, as suggested by Markus Mohrhard. Change-Id: I1333e125dafaa98dafc493bd25eb20f0b09c792e Suggested-by: Markus Mohrhard Signeg-off-by: Marcos Paulo de Souza --- test/source/sheet/xcellrangesquery.cxx | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/source/sheet/xcellrangesquery.cxx b/test/source/sheet/xcellrangesquery.cxx index b1f55e0..c2d1a07 100644 --- a/test/source/sheet/xcellrangesquery.cxx +++ b/test/source/sheet/xcellrangesquery.cxx @@ -48,7 +48,7 @@ void XCellRangesQuery::testQueryColumnDifference() uno::Reference xRanges = xCellRangesQuery->queryColumnDifferences(table::CellAddress(0, 1, 1)); rtl::OUString aResult = xRanges->getRangeAddressesAsString(); std::cout << "testQueryColumnDifference: Result: " << rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - CPPUNIT_ASSERT_MESSAGE("testQueryColumnDifference", aResult == aExpected); + CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryColumnDifference", aResult, aExpected); } void XCellRangesQuery::testQueryContentDifference() @@ -58,7 +58,7 @@ void XCellRangesQuery::testQueryContentDifference() uno::Reference xRanges = xCellRangesQuery->queryContentCells(sheet::CellFlags::VALUE); rtl::OUString aResult = xRanges->getRangeAddressesAsString(); std::cout << "testQueryContentDifference: Result: " << rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - CPPUNIT_ASSERT_MESSAGE("testQueryContentDifference", aResult == aExpected); + CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryContentDifference", aResult, aExpected); } void XCellRangesQuery::testQueryEmptyCells() @@ -68,7 +68,7 @@ void XCellRangesQuery::testQueryEmptyCells() uno::Reference xRanges = xCellRangesQuery->queryEmptyCells(); rtl::OUString aResult = xRanges->getRangeAddressesAsString(); std::cout << "testQueryEmptyCells: Result: " << rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - CPPUNIT_ASSERT_MESSAGE("testQueryEmptyCells", aResult == aExpected); + CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryEmptyCells", aResult, aExpected); } void XCellRangesQuery::testQueryFormulaCells() @@ -78,7 +78,7 @@ void XCellRangesQuery::testQueryFormulaCells() uno::Reference xRanges = xCellRangesQuery->queryFormulaCells(sheet::CellFlags::FORMULA); rtl::OUString aResult = xRanges->getRangeAddressesAsString(); std::cout << "testQueryFormulaCells: Result: " << rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - CPPUNIT_ASSERT_MESSAGE("testQueryFormulaCells", aResult == aExpected); + CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryFormulaCells", aResult, aExpected); } void XCellRangesQuery::testQueryIntersection() @@ -88,7 +88,7 @@ void XCellRangesQuery::testQueryIntersection() uno::Reference xRanges = xCellRangesQuery->queryIntersection(table::CellRangeAddress(0,3,3,7,7)); rtl::OUString aResult = xRanges->getRangeAddressesAsString(); std::cout << "testQueryIntersection: Result: " << rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - CPPUNIT_ASSERT_MESSAGE("testQueryFormulaCells", aResult == aExpected); + CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryIntersection", aResult, aExpected); } void XCellRangesQuery::testQueryRowDifference() @@ -98,7 +98,7 @@ void XCellRangesQuery::testQueryRowDifference() uno::Reference xRanges = xCellRangesQuery->queryRowDifferences(table::CellAddress(0,1,1)); rtl::OUString aResult = xRanges->getRangeAddressesAsString(); std::cout << "testQueryRowDifference: Result: " << rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - CPPUNIT_ASSERT_MESSAGE("testQueryFormulaCells", aResult == aExpected); + CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryRowDifference", aResult, aExpected); } void XCellRangesQuery::testQueryVisibleCells() @@ -108,7 +108,7 @@ void XCellRangesQuery::testQueryVisibleCells() uno::Reference xRanges = xCellRangesQuery->queryVisibleCells(); rtl::OUString aResult = xRanges->getRangeAddressesAsString(); std::cout << "testQueryVisibleCells: Result: " << rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl; - CPPUNIT_ASSERT_MESSAGE("testQueryFormulaCells", aResult == aExpected); + CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryVisibleCells", aResult, aExpected); } } -- 1.7.9.5