[Libreoffice-commits] core.git: sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Mar 20 10:50:55 UTC 2019
sc/qa/unit/ucalc.hxx | 2
sc/qa/unit/ucalc_sharedformula.cxx | 114 +++++++++++++++++++++++++++++++++++++
2 files changed, 116 insertions(+)
New commits:
commit f81d532648ccbbd08d3cb568eadc9f402dac67ad
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Tue Mar 19 22:28:03 2019 +0100
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Wed Mar 20 11:50:29 2019 +0100
Unit test for cut copy move into shared formula group reference, tdf#123714
Change-Id: Ibcf03f5068630c18eeecf2625cdff7ec1704d292
Reviewed-on: https://gerrit.libreoffice.org/69453
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index fed2f4e718de..b290fda217ee 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -409,6 +409,7 @@ public:
void testSharedFormulaListenerDeleteArea();
void testSharedFormulaUpdateOnReplacement();
void testSharedFormulaDeleteTopCell();
+ void testSharedFormulaCutCopyMoveIntoRef();
void testFormulaPosition();
void testFormulaWizardSubformula();
@@ -760,6 +761,7 @@ public:
CPPUNIT_TEST(testSharedFormulaListenerDeleteArea);
CPPUNIT_TEST(testSharedFormulaUpdateOnReplacement);
CPPUNIT_TEST(testSharedFormulaDeleteTopCell);
+ CPPUNIT_TEST(testSharedFormulaCutCopyMoveIntoRef);
CPPUNIT_TEST(testFormulaPosition);
CPPUNIT_TEST(testFormulaWizardSubformula);
CPPUNIT_TEST(testMixData);
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 91ef443a598c..c144a466e4fe 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -2422,5 +2422,119 @@ void Test::testSharedFormulaDeleteTopCell()
m_pDoc->DeleteTab(0);
}
+void Test::testSharedFormulaCutCopyMoveIntoRef()
+{
+ sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.
+
+ // tdf#123714 case 1
+ {
+ m_pDoc->InsertTab(0, "Test");
+
+ // Data in A1:C3
+ std::vector<std::vector<const char*>> aData = {
+ { "=B1", "", "1" },
+ { "=B2", "", "1" },
+ { "=B3", "", "" }
+ };
+ const ScAddress aOrgPos(0,0,0);
+ insertRangeData( m_pDoc, aOrgPos, aData);
+
+ ScMarkData aMark;
+ aMark.SelectOneTable(0);
+
+ // Set up clip document.
+ ScDocument aClipDoc(SCDOCMODE_CLIP);
+ aClipDoc.ResetClip(m_pDoc, &aMark);
+ // Cut C1:C2 to clipboard.
+ cutToClip( getDocShell(), ScRange(2,0,0, 2,1,0), &aClipDoc, false);
+
+ // Paste to B1:B2
+ ScRange aPasteRange(1,0,0, 1,1,0);
+ aMark.SetMarkArea(aPasteRange);
+ m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc);
+
+ // Check data in A1:A2 after Paste.
+ ScAddress aPos(aOrgPos);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("A1", 1.0, m_pDoc->GetValue(aPos));
+ aPos.IncRow();
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("A2", 1.0, m_pDoc->GetValue(aPos));
+
+ m_pDoc->DeleteTab(0);
+ }
+
+ // tdf#123714 case 2
+ {
+ m_pDoc->InsertTab(0, "Test");
+
+ // Data in A1:C3
+ std::vector<std::vector<const char*>> aData = {
+ { "1", "2", "=SUM(A1:B1)" },
+ { "4", "8", "=SUM(A2:B2)" },
+ { "16", "32", "=SUM(A3:B3)" },
+ { "64", "128", "=SUM(A4:B4)" },
+ };
+ const ScAddress aOrgPos(0,0,0);
+ insertRangeData( m_pDoc, aOrgPos, aData);
+
+ ScAddress aPos;
+ // Check results in C1:C4
+ const double fVec0[] = { 3.0, 12.0, 48.0, 192.0 };
+ aPos = ScAddress(2,0,0);
+ for (SCROW i=0; i < 4; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL( fVec0[i], m_pDoc->GetValue(aPos));
+ aPos.IncRow();
+ }
+
+ ScMarkData aMark;
+ aMark.SelectOneTable(0);
+
+ // Set up clip document.
+ ScDocument aClipDoc(SCDOCMODE_CLIP);
+ aClipDoc.ResetClip(m_pDoc, &aMark);
+ // Cut B1:B2 to clipboard.
+ cutToClip( getDocShell(), ScRange(1,0,0, 1,1,0), &aClipDoc, false);
+
+ // Check results in C1:C4 after Cut.
+ const double fVec1[] = { 1.0, 4.0, 48.0, 192.0 };
+ aPos = ScAddress(2,0,0);
+ for (SCROW i=0; i < 4; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL( fVec1[i], m_pDoc->GetValue(aPos));
+ aPos.IncRow();
+ }
+
+ // Paste to B3:B4
+ ScRange aPasteRange(1,2,0, 1,3,0);
+ aMark.SetMarkArea(aPasteRange);
+ m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc);
+
+ // Check results in C1:C4 after Paste.
+ const double fVec2[] = { 1.0, 4.0, 18.0, 72.0 };
+ aPos = ScAddress(2,0,0);
+ for (SCROW i=0; i < 4; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL( fVec2[i], m_pDoc->GetValue(aPos));
+ aPos.IncRow();
+ }
+
+ // Paste to B1:B2
+ aPasteRange = ScRange(1,0,0, 1,1,0);
+ aMark.SetMarkArea(aPasteRange);
+ m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc);
+
+ // Check results in C1:C4 after Paste.
+ const double fVec3[] = { 3.0, 12.0, 18.0, 72.0 };
+ aPos = ScAddress(2,0,0);
+ for (SCROW i=0; i < 4; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL( fVec3[i], m_pDoc->GetValue(aPos));
+ aPos.IncRow();
+ }
+
+ m_pDoc->DeleteTab(0);
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list