summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2021-03-05 00:34:31 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2021-03-08 09:02:07 +0100
commita75799f3e904bd46cffd0bac78e3c0885ac5c447 (patch)
treec6f0e61a7b7666facf0a2c660311c4b3ce5ffd03 /sc
parenteaa06413554be4ef4c73686c185c3d49e9defba4 (diff)
tdf#133260: move unittest to function test
Change-Id: I602f83e1a5afd0ab05c35b848a32475cac3b21ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111982 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/data/functions/mathematical/fods/sum.fods28
-rw-r--r--sc/qa/unit/ucalc.hxx2
-rw-r--r--sc/qa/unit/ucalc_formula.cxx19
3 files changed, 28 insertions, 21 deletions
diff --git a/sc/qa/unit/data/functions/mathematical/fods/sum.fods b/sc/qa/unit/data/functions/mathematical/fods/sum.fods
index 1aec65bdebef..4f6ad1ccc61f 100644
--- a/sc/qa/unit/data/functions/mathematical/fods/sum.fods
+++ b/sc/qa/unit/data/functions/mathematical/fods/sum.fods
@@ -2102,6 +2102,34 @@
<table:table-cell table:number-columns-repeated="5"/>
</table:table-row>
<table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce11" table:formula="of:=SUM(ABS(MUNIT(2)))" office:value-type="float" office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce55" table:formula="of:=ROUND([.A11];12)=ROUND([.B11];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>PRAVDA</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A11])" office:value-type="string" office:string-value="=SUM(ABS(MUNIT(2)))" calcext:value-type="string">
+ <text:p>=SUM(ABS(MUNIT(2)))</text:p>
+ </table:table-cell>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce11" table:formula="of:=SUM(ABS(MUNIT(2)*-1))" office:value-type="float" office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce55" table:formula="of:=ROUND([.A12];12)=ROUND([.B12];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>PRAVDA</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=SUM(ABS(MUNIT(2)*-1))" calcext:value-type="string">
+ <text:p>=SUM(ABS(MUNIT(2)*-1))</text:p>
+ </table:table-cell>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
<table:table-cell table:style-name="ce11"/>
<table:table-cell/>
<table:table-cell table:style-name="ce55"/>
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 8ee8d28868c3..9c9b381315ab 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -567,7 +567,6 @@ public:
void testTdf97369();
void testTdf97587();
void testTdf93415();
- void testTdf133260();
void testTdf100818();
void testEmptyCalcDocDefaults();
@@ -878,7 +877,6 @@ public:
CPPUNIT_TEST(testTdf97369);
CPPUNIT_TEST(testTdf97587);
CPPUNIT_TEST(testTdf93415);
- CPPUNIT_TEST(testTdf133260);
CPPUNIT_TEST(testTdf100818);
CPPUNIT_TEST(testEmptyCalcDocDefaults);
CPPUNIT_TEST(testPrecisionAsShown);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 34325dd8d988..6ff96cfd4b89 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -8641,25 +8641,6 @@ void Test::testTdf93415()
m_pDoc->DeleteTab(0);
}
-void Test::testTdf133260()
-{
- CPPUNIT_ASSERT(m_pDoc->InsertTab (0, "Test"));
-
- ScAddress aPos1(0,0,0);
- m_pDoc->SetString(aPos1, "=SUM(ABS(MUNIT(2)))");
-
- ScAddress aPos2(0,1,0);
- m_pDoc->SetString(aPos2, "=SUM(ABS(MUNIT(2)*-1))");
-
- // Without the fix in place, this test would have failed with
- // - Expected: 2
- // - Actual : 1
- CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(aPos1));
- CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(aPos2));
-
- m_pDoc->DeleteTab(0);
-}
-
void Test::testTdf100818()
{
CPPUNIT_ASSERT(m_pDoc->InsertTab (0, "Sheet1"));