diff options
author | Aleksas Pantechovskis <alex.pantec@gmail.com> | 2016-03-04 16:03:17 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-03-05 20:52:41 +0000 |
commit | 0355b6b5d252e10193171e86cc5edbf0ab1e9503 (patch) | |
tree | 0bbff43c153e227cf6d80593268092193fff8480 /sc/qa/unit/ucalc_sort.cxx | |
parent | 4ccd0d99f00b11f1615a50f5eabaf261cc218c76 (diff) |
tdf#98264, replace CPPUNIT_ASSERT with CPPUNIT_ASSERT_EQUAL
Change-Id: Ic02ed30b7135d648c8aac97f65e286c163597f86
Reviewed-on: https://gerrit.libreoffice.org/22908
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc/qa/unit/ucalc_sort.cxx')
-rw-r--r-- | sc/qa/unit/ucalc_sort.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx index bb8151d24d07..e692ec8fa5af 100644 --- a/sc/qa/unit/ucalc_sort.cxx +++ b/sc/qa/unit/ucalc_sort.cxx @@ -43,7 +43,7 @@ void Test::testSort() clearRange(m_pDoc, ScRange(0, 0, 0, 1, SAL_N_ELEMENTS(aData), 0)); aDataRange = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position", aDataRange.aStart == aPos); + CPPUNIT_ASSERT_EQUAL_MESSAGE("failed to insert range data at correct position", aPos, aDataRange.aStart); } // Insert note in cell B2. @@ -85,7 +85,7 @@ void Test::testSort() }; aDataRange = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position", aDataRange.aStart == aPos); + CPPUNIT_ASSERT_EQUAL_MESSAGE("failed to insert range data at correct position", aPos, aDataRange.aStart); } aSortData.nCol1 = aDataRange.aStart.Col(); @@ -1062,7 +1062,7 @@ void Test::testSortRefUpdate4_Impl() ScAddress aPos(0,0,nTab); clearRange(m_pDoc, ScRange(0, 0, nTab, 1, SAL_N_ELEMENTS(aData), nTab)); aLesson1Range = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position", aLesson1Range.aStart == aPos); + CPPUNIT_ASSERT_EQUAL_MESSAGE("failed to insert range data at correct position", aPos, aLesson1Range.aStart); } ScRange aLesson2Range; @@ -1080,7 +1080,7 @@ void Test::testSortRefUpdate4_Impl() ScAddress aPos(0,0,nTab); clearRange(m_pDoc, ScRange(0, 0, nTab, 1, SAL_N_ELEMENTS(aData), nTab)); aLesson2Range = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position", aLesson2Range.aStart == aPos); + CPPUNIT_ASSERT_EQUAL_MESSAGE("failed to insert range data at correct position", aPos, aLesson2Range.aStart); } ScRange aSortRange; @@ -1098,7 +1098,7 @@ void Test::testSortRefUpdate4_Impl() ScAddress aPos(0,0,nTab); clearRange(m_pDoc, ScRange(0, 0, nTab, 1, SAL_N_ELEMENTS(aData), nTab)); aSortRange = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position", aSortRange.aStart == aPos); + CPPUNIT_ASSERT_EQUAL_MESSAGE("failed to insert range data at correct position", aPos, aSortRange.aStart); } ScDBDocFunc aFunc(getDocShell()); @@ -1265,7 +1265,7 @@ void Test::testSortRefUpdate5() ScAddress aPos(0,0,nTab); clearRange(m_pDoc, ScRange(0, 0, nTab, 2, SAL_N_ELEMENTS(aData), nTab)); aSortRange = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position", aSortRange.aStart == aPos); + CPPUNIT_ASSERT_EQUAL_MESSAGE("failed to insert range data at correct position", aPos, aSortRange.aStart); // Actual results and expected sorted results. for (SCROW nRow=0; nRow < static_cast<SCROW>(SAL_N_ELEMENTS(aValCheck)); ++nRow) @@ -1357,7 +1357,7 @@ void Test::testSortRefUpdate6() ScAddress aPos(0,0,0); ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT(aDataRange.aStart == aPos); + CPPUNIT_ASSERT_EQUAL(aPos, aDataRange.aStart); { // Expected output table content. 0 = empty cell @@ -1497,7 +1497,7 @@ void Test::testSortBroadcaster() ScAddress aPos(0,0,0); ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT(aDataRange.aStart == aPos); + CPPUNIT_ASSERT_EQUAL(aPos, aDataRange.aStart); { // Expected output table content. 0 = empty cell @@ -1597,7 +1597,7 @@ void Test::testSortBroadcaster() ScAddress aPos(0,4,0); ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData, SAL_N_ELEMENTS(aData)); - CPPUNIT_ASSERT(aDataRange.aStart == aPos); + CPPUNIT_ASSERT_EQUAL(aPos, aDataRange.aStart); { // Expected output table content. 0 = empty cell @@ -1799,7 +1799,7 @@ void Test::testSortPartialFormulaGroup() const ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(1,1,0)); CPPUNIT_ASSERT(pFC); CPPUNIT_ASSERT_MESSAGE("This formula cell should be the first in a group.", pFC->IsSharedTop()); - CPPUNIT_ASSERT_MESSAGE("Incorrect formula group length.", pFC->GetSharedLength() == 5); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect formula group length.", static_cast<SCROW>(5), pFC->GetSharedLength()); ScDBDocFunc aFunc(getDocShell()); |