no need for strange assert fail message

Change-Id: Id982d0b12e18213a8d76a2d562109d7e2a41d8b5

1 files changed, 27 insertions, 28 deletions

diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx
index 0ac865b4c762..8be88bbb57be 100644
--- a/sc/qa/extras/sccondformats.cxx
+++ b/sc/qa/extras/sccondformats.cxx
@@ -122,7 +122,6 @@ void ScConditionalFormatTest::testCondFormat()
 
 void ScConditionalFormatTest::testUndoAnchor()
 {
-    const OString sFailedMessage = OString("Failed on :");
     OUString aFileURL;
     createFileURL("document_with_linked_graphic.ods", aFileURL);
     // open the document with graphic included
@@ -134,48 +133,48 @@ void ScConditionalFormatTest::testUndoAnchor()
     CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
 
     ScDocShell* xDocSh = dynamic_cast<ScDocShell*>(pFoundShell);
-    CPPUNIT_ASSERT(xDocSh != nullptr);
+    CPPUNIT_ASSERT(xDocSh);
 
     // Check whether graphic imported well
     ScDocument& rDoc = xDocSh->GetDocument();
     ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawLayer != nullptr );
+    CPPUNIT_ASSERT(pDrawLayer);
 
     const SdrPage *pPage = pDrawLayer->GetPage(0);
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pPage != nullptr );
+    CPPUNIT_ASSERT(pPage);
 
     SdrGrafObj* pObject = dynamic_cast<SdrGrafObj*>(pPage->GetObj(0));
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pObject != nullptr );
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pObject->IsLinkedGraphic() );
+    CPPUNIT_ASSERT(pObject);
+    CPPUNIT_ASSERT(pObject->IsLinkedGraphic());
 
     const GraphicObject& rGraphicObj = pObject->GetGraphicObject(true);
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), !rGraphicObj.IsSwappedOut());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), sal_uLong(864900), rGraphicObj.GetSizeBytes());
+    CPPUNIT_ASSERT(!rGraphicObj.IsSwappedOut());
+    CPPUNIT_ASSERT_EQUAL(GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
+    CPPUNIT_ASSERT_EQUAL(sal_uLong(864900), rGraphicObj.GetSizeBytes());
 
     // Get the document controller
     ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pViewShell != nullptr );
+    CPPUNIT_ASSERT(pViewShell);
 
     // Get the draw view of the document
     ScDrawView* pDrawView = pViewShell->GetViewData().GetScDrawView();
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawView != nullptr );
+    CPPUNIT_ASSERT(pDrawView);
 
     // Select graphic object
     pDrawView->MarkNextObj();
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawView->AreObjectsMarked() );
+    CPPUNIT_ASSERT(pDrawView->AreObjectsMarked() );
 
     // Set Cell Anchor
     ScDrawLayer::SetCellAnchoredFromPosition(*pObject, rDoc, 0);
     // Check state
     ScAnchorType oldType = ScDrawLayer::GetAnchorType(*pObject);
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), oldType == SCA_CELL );
+    CPPUNIT_ASSERT(oldType == SCA_CELL );
 
     // Change all selected objects to page anchor
     pViewShell->GetViewData().GetDispatcher().Execute(SID_ANCHOR_PAGE);
     // Check state
     ScAnchorType newType = ScDrawLayer::GetAnchorType(*pObject);
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), newType == SCA_PAGE );
+    CPPUNIT_ASSERT(newType == SCA_PAGE );
 
     // Undo and check its result.
     SfxUndoManager* pUndoMgr = rDoc.GetUndoManager();
@@ -183,41 +182,41 @@ void ScConditionalFormatTest::testUndoAnchor()
     pUndoMgr->Undo();
 
     // Check anchor type
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), oldType == ScDrawLayer::GetAnchorType(*pObject) );
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), sal_uLong(864900), rGraphicObj.GetSizeBytes());
+    CPPUNIT_ASSERT(oldType == ScDrawLayer::GetAnchorType(*pObject) );
+    CPPUNIT_ASSERT_EQUAL(GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
+    CPPUNIT_ASSERT_EQUAL(sal_uLong(864900), rGraphicObj.GetSizeBytes());
 
     pUndoMgr->Redo();
 
     // Check anchor type
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), newType == ScDrawLayer::GetAnchorType(*pObject) );
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), sal_uLong(864900), rGraphicObj.GetSizeBytes());
+    CPPUNIT_ASSERT(newType == ScDrawLayer::GetAnchorType(*pObject) );
+    CPPUNIT_ASSERT_EQUAL(GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
+    CPPUNIT_ASSERT_EQUAL(sal_uLong(864900), rGraphicObj.GetSizeBytes());
 
     ScDrawLayer::SetPageAnchored(*pObject);
     // Check state
     oldType = ScDrawLayer::GetAnchorType(*pObject);
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), oldType == SCA_PAGE );
+    CPPUNIT_ASSERT(oldType == SCA_PAGE );
 
     // Change all selected objects to cell anchor
     pViewShell->GetViewData().GetDispatcher().Execute(SID_ANCHOR_CELL);
     // Check state
     newType = ScDrawLayer::GetAnchorType(*pObject);
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), newType == SCA_CELL );
+    CPPUNIT_ASSERT(newType == SCA_CELL );
 
     pUndoMgr->Undo();
 
     // Check anchor type
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), oldType == ScDrawLayer::GetAnchorType(*pObject) );
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), sal_uLong(864900), rGraphicObj.GetSizeBytes());
+    CPPUNIT_ASSERT(oldType == ScDrawLayer::GetAnchorType(*pObject) );
+    CPPUNIT_ASSERT_EQUAL(GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
+    CPPUNIT_ASSERT_EQUAL(sal_uLong(864900), rGraphicObj.GetSizeBytes());
 
     pUndoMgr->Redo();
 
     // Check anchor type
-    CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), newType == ScDrawLayer::GetAnchorType(*pObject) );
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), sal_uLong(864900), rGraphicObj.GetSizeBytes());
+    CPPUNIT_ASSERT(newType == ScDrawLayer::GetAnchorType(*pObject) );
+    CPPUNIT_ASSERT_EQUAL(GRAPHIC_BITMAP, rGraphicObj.GetGraphic().GetType());
+    CPPUNIT_ASSERT_EQUAL(sal_uLong(864900), rGraphicObj.GetSizeBytes());
 
     xComponent->dispose();
 }