diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-03-05 00:03:59 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-03-07 21:20:30 +0100 |
commit | ce507a14c551b9d2ce64c5cf1580431bb04b01a0 (patch) | |
tree | acaa7f18a03a68f48727fa229f383b730936a92a | |
parent | 5d71f2d2168de045ab8d1e0fa80a7580b4facafc (diff) |
tdf#107459: move unittest to function test
Change-Id: Ic509ba1451e5f59e2f61a37816132ef5bb9ac440
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111981
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r-- | sc/qa/unit/data/functions/spreadsheet/fods/match.fods | 15 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.hxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/ucalc_formula.cxx | 16 |
3 files changed, 12 insertions, 21 deletions
diff --git a/sc/qa/unit/data/functions/spreadsheet/fods/match.fods b/sc/qa/unit/data/functions/spreadsheet/fods/match.fods index 5aada9207b86..892d139ede32 100644 --- a/sc/qa/unit/data/functions/spreadsheet/fods/match.fods +++ b/sc/qa/unit/data/functions/spreadsheet/fods/match.fods @@ -5847,9 +5847,18 @@ <table:table-cell table:number-columns-repeated="16"/> </table:table-row> <table:table-row table:style-name="ro6"> - <table:table-cell table:style-name="ce13" table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce16"/> - <table:table-cell table:style-name="ce19"/> + <table:table-cell table:formula="of:=MATCH(5;{20;19;18;17;16;15;14;13;12;11;10;6;6;5;5;4;4;3;2;1};-1)" office:value-type="float" office:value="15" calcext:value-type="float"> + <text:p>15</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce13" office:value-type="float" office:value="15" calcext:value-type="float"> + <text:p>15.000000</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A117]=[.B117]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=FORMULA([.A117])" office:value-type="string" office:string-value="=MATCH(5;{20;19;18;17;16;15;14;13;12;11;10;6;6;5;5;4;4;3;2;1};-1)" calcext:value-type="string"> + <text:p>=MATCH(5;{20;19;18;17;16;15;14;13;12;11;10;6;6;5;5;4;4;3;2;1};-1)</text:p> + </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell office:value-type="float" office:value="5" calcext:value-type="float"> <text:p>5</text:p> diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index 19c16ee8d56b..8ee8d28868c3 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -566,7 +566,6 @@ public: void testTdf97369(); void testTdf97587(); - void testTdf107459(); void testTdf93415(); void testTdf133260(); void testTdf100818(); @@ -878,7 +877,6 @@ public: CPPUNIT_TEST(testMultipleDataCellsInRange); CPPUNIT_TEST(testTdf97369); CPPUNIT_TEST(testTdf97587); - CPPUNIT_TEST(testTdf107459); CPPUNIT_TEST(testTdf93415); CPPUNIT_TEST(testTdf133260); CPPUNIT_TEST(testTdf100818); diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 1882fbc168c5..34325dd8d988 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -8621,22 +8621,6 @@ void Test::testTdf97587() m_pDoc->DeleteTab(0); } -void Test::testTdf107459() -{ - CPPUNIT_ASSERT(m_pDoc->InsertTab (0, "Test")); - - ScAddress aPos(0,0,0); - m_pDoc->SetString(aPos, - "=MATCH(5;{20;19;18;17;16;15;14;13;12;11;10;6;6;5;5;4;4;3;2;1};-1)"); - - // Without the fix in place, this would have failed with - // - Expected: 15 - // - Actual : 14 - CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos)); - - m_pDoc->DeleteTab(0); -} - void Test::testTdf93415() { CPPUNIT_ASSERT(m_pDoc->InsertTab (0, "Sheet1")); |