use better assertion macros

4 files changed, 14 insertions, 14 deletions

diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index 9443e9eb093c..786202ba8abd 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -99,7 +99,7 @@ void DBAccessTest::setUp()
     // which is a private symbol to us, gets called
     mxDesktop = Reference<com::sun::star::frame::XDesktop>( getMultiServiceFactory()->createInstance(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
-    CPPUNIT_ASSERT_MESSAGE("", mxDesktop.is());
+    CPPUNIT_ASSERT(mxDesktop.is());
 }
 
 void DBAccessTest::tearDown()
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 5e908d9bf17c..cfba25818917 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -141,7 +141,7 @@ void ScMacrosTest::testStarBasic()
     double aValue;
     pDoc->GetValue(0,0,0,aValue);
     std::cout << "returned value = " << aValue << std::endl;
-    CPPUNIT_ASSERT_MESSAGE("script did not change the value of Sheet1.A1",aValue==2);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("script did not change the value of Sheet1.A1",2.0, aValue, 0.00001);
     xDocSh->DoClose();
 }
 
@@ -207,7 +207,7 @@ void ScMacrosTest::setUp()
     CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
     mxDesktop = Reference<com::sun::star::frame::XDesktop>( getMultiServiceFactory()->createInstance(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
-    CPPUNIT_ASSERT_MESSAGE("", mxDesktop.is());
+    CPPUNIT_ASSERT(mxDesktop.is());
 }
 
 void ScMacrosTest::tearDown()
diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx
index 9f5b3aa07a42..b5c9a466ca89 100644
--- a/test/source/sheet/xnamedranges.cxx
+++ b/test/source/sheet/xnamedranges.cxx
@@ -180,7 +180,7 @@ void XNamedRanges::testRemoveByName()
         sal_Int32 nInitialCount = xIndex->getCount();
         xNamedRanges->removeByName(maNameToRemove);
         sal_Int32 nNewCount = xIndex->getCount();
-        CPPUNIT_ASSERT_MESSAGE("NamedRange initial1 not removed", nNewCount == nInitialCount - 1);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("NamedRange initial1 not removed", nNewCount, nInitialCount - 1);
         CPPUNIT_ASSERT_MESSAGE("Wrong NamedRange removed, initial1 still present", !xNamedRanges->hasByName(maNameToRemove));
         // try to remove non existing
         rtl::OUString aNr2(RTL_CONSTASCII_USTRINGPARAM("dummyNonExistingNamedRange"));
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index 263425995a81..3d777c0e8a12 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -92,7 +92,7 @@ void XSpreadsheets2::testImportString()
     uno::Reference< text::XTextRange > xDestTextRange(xDestCell, UNO_QUERY_THROW);
     rtl::OUString aDestString = xDestTextRange->getString();
 
-    CPPUNIT_ASSERT_MESSAGE("Wrong string imported", aDestString.equals(aSrcString));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong string imported", aDestString, aSrcString);
 }
 
 void XSpreadsheets2::testImportValue()
@@ -108,7 +108,7 @@ void XSpreadsheets2::testImportValue()
     uno::Reference< table::XCell > xDestCell = xDestSheet->getCellByPosition(1,0);
     sal_Int32 aDestValue = xDestCell->getValue();
 
-    CPPUNIT_ASSERT_MESSAGE("Wrong value imported", aSrcValue == aDestValue);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong value imported", aSrcValue, aDestValue);
 }
 
 void XSpreadsheets2::testImportFormulaBasicMath()
@@ -126,7 +126,7 @@ void XSpreadsheets2::testImportFormulaBasicMath()
 
     // potential problem later: formulas might be adjusted
     // add some tests that the formulas are correctly adjusted
-    CPPUNIT_ASSERT_MESSAGE("Wrong formula imported", aDestFormula.equals(aSrcFormula));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong formula imported", aDestFormula, aSrcFormula);
 }
 
 void XSpreadsheets2::testImportFormulaWithNamedRange()
@@ -142,7 +142,7 @@ void XSpreadsheets2::testImportFormulaWithNamedRange()
     uno::Reference< table::XCell > xDestCell = xDestSheet->getCellByPosition(3,0);
     rtl::OUString aDestFormula = xDestCell->getFormula();
 
-    CPPUNIT_ASSERT_MESSAGE("Wrong Namedrange formula imported", aDestFormula.equals(aSrcFormula));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong Namedrange formula imported", aDestFormula, aSrcFormula);
 }
 
 void XSpreadsheets2::testImportOverExistingNamedRange()
@@ -166,7 +166,7 @@ void XSpreadsheets2::testImportOverExistingNamedRange()
     rtl::OUString aExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$1"));
 
     std::cout << "testImportSheet : initial1 aNrDestContent " << aNrDestContent << std::endl;
-    CPPUNIT_ASSERT_MESSAGE("Wrong address for initial1", aNrDestContent.equals(aExpectedContent));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for initial1", aNrDestContent, aExpectedContent);
 
 }
 
@@ -191,7 +191,7 @@ void XSpreadsheets2::testImportNamedRangeDefinedInSource()
 
     std::cout << "testImportSheet : InSheetRangeName content " << aNewInSheetNrDestContent << std::endl;
     std::cout << "testImportSheet : InSheetRangeName expected " << aNewInSheetExpectedContent << std::endl;
-    CPPUNIT_ASSERT_MESSAGE("Wrong address for InSheetRangeName", aNewInSheetNrDestContent.equals(aNewInSheetExpectedContent));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for InSheetRangeName", aNewInSheetNrDestContent, aNewInSheetExpectedContent);
 }
 
 void XSpreadsheets2::testImportNamedRangeRedefinedInSource()
@@ -213,7 +213,7 @@ void XSpreadsheets2::testImportNamedRangeRedefinedInSource()
     rtl::OUString aRedefinedInSheetNrDestContent = xDestRedefinedInSheetNamedRange->getContent();
     rtl::OUString aRedefinedInSheetExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$2"));
     std::cout << "testImportSheet : initial2 content " << aRedefinedInSheetNrDestContent << std::endl;
-    CPPUNIT_ASSERT_MESSAGE("Wrong address for Redefined InSheet named range", aRedefinedInSheetNrDestContent.equals(aRedefinedInSheetExpectedContent));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for Redefined InSheet named range", aRedefinedInSheetNrDestContent, aRedefinedInSheetExpectedContent);
 }
 
 void XSpreadsheets2::testImportNewNamedRange()
@@ -267,7 +267,7 @@ void XSpreadsheets2::testImportCellStyle()
     rtl::OUString aDestStyleName;
     CPPUNIT_ASSERT(xDestCellPropSet->getPropertyValue(aCellProperty) >>= aDestStyleName);
 
-    CPPUNIT_ASSERT_MESSAGE("Wrong imported Cell Style", aDestStyleName.equals(aSrcStyleName));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong imported Cell Style", aDestStyleName, aSrcStyleName);
 
     uno::Reference< style::XStyleFamiliesSupplier > xFamiliesSupplier (xDestDoc, UNO_QUERY_THROW);
     uno::Reference< container::XNameAccess > xFamiliesNameAccess (xFamiliesSupplier->getStyleFamilies(), UNO_QUERY_THROW);
@@ -283,7 +283,7 @@ void XSpreadsheets2::testImportCellStyle()
     sal_Int32 aVertJustify = 0;
     CPPUNIT_ASSERT(xCellStyleProp->getPropertyValue(aProperty) >>= aVertJustify);
 
-    CPPUNIT_ASSERT_MESSAGE("New style: VertJustify not set", aVertJustify == table::CellVertJustify_CENTER);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("New style: VertJustify not set", aVertJustify, table::CellVertJustify_CENTER);
 }
 
 uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const rtl::OUString& aFileBase, uno::Reference< lang::XComponent >& xComp)
@@ -326,7 +326,7 @@ void XSpreadsheets2::importSheetToCopy()
         uno::Reference< sheet::XSpreadsheets2 > xDestSheets (xDestDoc->getSheets(), UNO_QUERY_THROW);
         sal_Int32 nDestPos = 0;
         sal_Int32 nDestPosEffective = xDestSheets->importSheet(xDocument, aSrcSheetName, nDestPos);
-        CPPUNIT_ASSERT_MESSAGE("Wrong sheet index", nDestPosEffective == nDestPos);
+        CPPUNIT_ASSERT_EQUALS_MESSAGE("Wrong sheet index", nDestPosEffective, nDestPos);
     }
     else
     {