[Libreoffice-commits] core.git: sc/qa

[kerem]

 sc/qa/unit/filters-test.cxx |   26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

New commits:
commit 9fb55f7b1de8be1c3f86a4ae540f648574d3ed45
Author: kerem <hallackerem at gmail.com>
Date:   Sat Dec 31 13:26:37 2016 +0200

    tdf#90290 use custom asserter in filters-test.cxx
    
    Change-Id: Ia5fb43c8f5398659a08982700dbece72959af19c
    Reviewed-on: https://gerrit.libreoffice.org/32529
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index ff0b8f4..13b3239 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -358,28 +358,16 @@ void ScFiltersTest::testSharedFormulaXLS()
     ScDocument& rDoc2 = xDocSh->GetDocument();
     rDoc2.CalcAll();
 
-    if (!checkFormula(rDoc2, ScAddress(1,0,0), "A1*20"))
-        CPPUNIT_FAIL("Wrong formula.");
-
-    if (!checkFormula(rDoc2, ScAddress(1,1,0), "A2*20"))
-        CPPUNIT_FAIL("Wrong formula.");
-
-    if (!checkFormula(rDoc2, ScAddress(1,2,0), "A3*20"))
-        CPPUNIT_FAIL("Wrong formula.");
+    ASSERT_FORMULA_EQUAL(rDoc2, ScAddress(1,0,0), "A1*20", "Wrong formula.");
+    ASSERT_FORMULA_EQUAL(rDoc2, ScAddress(1,1,0), "A2*20", "Wrong formula.");
+    ASSERT_FORMULA_EQUAL(rDoc2, ScAddress(1,2,0), "A3*20", "Wrong formula.");
 
     // There is an intentional gap at row 4.
 
-    if (!checkFormula(rDoc2, ScAddress(1,4,0), "A5*20"))
-        CPPUNIT_FAIL("Wrong formula.");
-
-    if (!checkFormula(rDoc2, ScAddress(1,5,0), "A6*20"))
-        CPPUNIT_FAIL("Wrong formula.");
-
-    if (!checkFormula(rDoc2, ScAddress(1,6,0), "A7*20"))
-        CPPUNIT_FAIL("Wrong formula.");
-
-    if (!checkFormula(rDoc2, ScAddress(1,7,0), "A8*20"))
-        CPPUNIT_FAIL("Wrong formula.");
+    ASSERT_FORMULA_EQUAL(rDoc2, ScAddress(1,4,0), "A5*20", "Wrong formula.");
+    ASSERT_FORMULA_EQUAL(rDoc2, ScAddress(1,5,0), "A6*20", "Wrong formula.");
+    ASSERT_FORMULA_EQUAL(rDoc2, ScAddress(1,6,0), "A7*20", "Wrong formula.");
+    ASSERT_FORMULA_EQUAL(rDoc2, ScAddress(1,7,0), "A8*20", "Wrong formula.");
 
     // We re-group formula cells on load. Let's check that as well.