ScSimpleBootstrapFixture -> ScUcalcTestBase
Change-Id: I69def1dccf4f1f35ef1ab14436fc71493b75eb6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143242
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 4624db4..27b3c49 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -447,7 +447,7 @@ bool checkOutput(
return bResult;
}
void ScSimpleBootstrapFixture::setUp()
void ScUcalcTestBase::setUp()
{
BootstrapFixture::setUp();
@@ -461,7 +461,7 @@ void ScSimpleBootstrapFixture::setUp()
m_pDoc = &m_xDocShell->GetDocument();
}
void ScSimpleBootstrapFixture::tearDown()
void ScUcalcTestBase::tearDown()
{
m_xDocShell->DoClose();
m_xDocShell.clear();
@@ -541,7 +541,7 @@ void ScModelTestBase::miscRowHeightsTest( TestParam const * aTestValues, unsigne
}
}
ScRange ScSimpleBootstrapFixture::insertRangeData(
ScRange ScUcalcTestBase::insertRangeData(
ScDocument* pDoc, const ScAddress& rPos, const std::vector<std::vector<const char*>>& rData )
{
if (rData.empty())
@@ -588,7 +588,7 @@ ScRange ScSimpleBootstrapFixture::insertRangeData(
return aRange;
}
ScUndoCut* ScSimpleBootstrapFixture::cutToClip(ScDocShell& rDocSh, const ScRange& rRange, ScDocument* pClipDoc, bool bCreateUndo)
ScUndoCut* ScUcalcTestBase::cutToClip(ScDocShell& rDocSh, const ScRange& rRange, ScDocument* pClipDoc, bool bCreateUndo)
{
ScDocument* pSrcDoc = &rDocSh.GetDocument();
@@ -622,7 +622,7 @@ ScUndoCut* ScSimpleBootstrapFixture::cutToClip(ScDocShell& rDocSh, const ScRange
return nullptr;
}
void ScSimpleBootstrapFixture::copyToClip(ScDocument* pSrcDoc, const ScRange& rRange, ScDocument* pClipDoc)
void ScUcalcTestBase::copyToClip(ScDocument* pSrcDoc, const ScRange& rRange, ScDocument* pClipDoc)
{
ScClipParam aClipParam(rRange, false);
ScMarkData aMark(pSrcDoc->GetSheetLimits());
@@ -630,14 +630,14 @@ void ScSimpleBootstrapFixture::copyToClip(ScDocument* pSrcDoc, const ScRange& rR
pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aMark, false, false);
}
void ScSimpleBootstrapFixture::pasteFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc)
void ScUcalcTestBase::pasteFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc)
{
ScMarkData aMark(pDestDoc->GetSheetLimits());
aMark.SetMarkArea(rDestRange);
pDestDoc->CopyFromClip(rDestRange, aMark, InsertDeleteFlags::ALL, nullptr, pClipDoc);
}
ScUndoPaste* ScSimpleBootstrapFixture::createUndoPaste(ScDocShell& rDocSh, const ScRange& rRange, ScDocumentUniquePtr pUndoDoc)
ScUndoPaste* ScUcalcTestBase::createUndoPaste(ScDocShell& rDocSh, const ScRange& rRange, ScDocumentUniquePtr pUndoDoc)
{
ScDocument& rDoc = rDocSh.GetDocument();
ScMarkData aMarkData(rDoc.GetSheetLimits());
@@ -648,7 +648,7 @@ ScUndoPaste* ScSimpleBootstrapFixture::createUndoPaste(ScDocShell& rDocSh, const
&rDocSh, rRange, aMarkData, std::move(pUndoDoc), nullptr, InsertDeleteFlags::ALL, std::move(pRefUndoData), false);
}
void ScSimpleBootstrapFixture::pasteOneCellFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc, InsertDeleteFlags eFlags)
void ScUcalcTestBase::pasteOneCellFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc, InsertDeleteFlags eFlags)
{
ScMarkData aMark(pDestDoc->GetSheetLimits());
aMark.SetMarkArea(rDestRange);
@@ -660,14 +660,14 @@ void ScSimpleBootstrapFixture::pasteOneCellFromClip(ScDocument* pDestDoc, const
rDestRange.aEnd.Col(), rDestRange.aEnd.Row());
}
void ScSimpleBootstrapFixture::setCalcAsShown(ScDocument* pDoc, bool bCalcAsShown)
void ScUcalcTestBase::setCalcAsShown(ScDocument* pDoc, bool bCalcAsShown)
{
ScDocOptions aOpt = pDoc->GetDocOptions();
aOpt.SetCalcAsShown(bCalcAsShown);
pDoc->SetDocOptions(aOpt);
}
ScDocShell* ScSimpleBootstrapFixture::findLoadedDocShellByName(std::u16string_view rName)
ScDocShell* ScUcalcTestBase::findLoadedDocShellByName(std::u16string_view rName)
{
ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>, false));
while (pShell)
@@ -684,7 +684,7 @@ ScDocShell* ScSimpleBootstrapFixture::findLoadedDocShellByName(std::u16string_vi
return nullptr;
}
bool ScSimpleBootstrapFixture::insertRangeNames(
bool ScUcalcTestBase::insertRangeNames(
ScDocument* pDoc, ScRangeName* pNames, const RangeNameDef* p, const RangeNameDef* pEnd)
{
ScAddress aA1(0, 0, 0);
@@ -708,7 +708,7 @@ bool ScSimpleBootstrapFixture::insertRangeNames(
return true;
}
OUString ScSimpleBootstrapFixture::getRangeByName(ScDocument* pDoc, const OUString& aRangeName)
OUString ScUcalcTestBase::getRangeByName(ScDocument* pDoc, const OUString& aRangeName)
{
ScRangeData* pName = pDoc->GetRangeName()->findByUpperName(aRangeName.toAsciiUpperCase());
CPPUNIT_ASSERT(pName);
@@ -716,7 +716,7 @@ OUString ScSimpleBootstrapFixture::getRangeByName(ScDocument* pDoc, const OUStri
}
#if CALC_DEBUG_OUTPUT != 0
void ScSimpleBootstrapFixture::printFormula(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const char* pCaption)
void ScUcalcTestBase::printFormula(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const char* pCaption)
{
if (pCaption != nullptr)
cout << pCaption << ", ";
@@ -725,10 +725,10 @@ void ScSimpleBootstrapFixture::printFormula(ScDocument* pDoc, SCCOL nCol, SCROW
}
#else
// Avoid unused parameter warning
void ScSimpleBootstrapFixture::printFormula(ScDocument*, SCCOL, SCROW, SCTAB, const char*) {}
void ScUcalcTestBase::printFormula(ScDocument*, SCCOL, SCROW, SCTAB, const char*) {}
#endif
void ScSimpleBootstrapFixture::printRange(ScDocument* pDoc, const ScRange& rRange, const char* pCaption,
void ScUcalcTestBase::printRange(ScDocument* pDoc, const ScRange& rRange, const char* pCaption,
const bool printFormula)
{
SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
@@ -748,13 +748,13 @@ void ScSimpleBootstrapFixture::printRange(ScDocument* pDoc, const ScRange& rRang
printer.print(pCaption);
}
void ScSimpleBootstrapFixture::printRange(ScDocument* pDoc, const ScRange& rRange, const OString& rCaption,
void ScUcalcTestBase::printRange(ScDocument* pDoc, const ScRange& rRange, const OString& rCaption,
const bool printFormula)
{
printRange(pDoc, rRange, rCaption.getStr(), printFormula);
}
void ScSimpleBootstrapFixture::clearRange(ScDocument* pDoc, const ScRange& rRange)
void ScUcalcTestBase::clearRange(ScDocument* pDoc, const ScRange& rRange)
{
ScMarkData aMarkData(pDoc->GetSheetLimits());
aMarkData.SetMarkArea(rRange);
@@ -763,13 +763,13 @@ void ScSimpleBootstrapFixture::clearRange(ScDocument* pDoc, const ScRange& rRang
rRange.aEnd.Col(), rRange.aEnd.Row(), aMarkData, InsertDeleteFlags::CONTENTS);
}
void ScSimpleBootstrapFixture::clearSheet(ScDocument* pDoc, SCTAB nTab)
void ScUcalcTestBase::clearSheet(ScDocument* pDoc, SCTAB nTab)
{
ScRange aRange(0,0,nTab,pDoc->MaxCol(),pDoc->MaxRow(),nTab);
clearRange(pDoc, aRange);
}
bool ScSimpleBootstrapFixture::checkFormulaPosition(ScDocument& rDoc, const ScAddress& rPos)
bool ScUcalcTestBase::checkFormulaPosition(ScDocument& rDoc, const ScAddress& rPos)
{
OUString aStr(rPos.Format(ScRefFlags::VALID));
const ScFormulaCell* pFC = rDoc.GetFormulaCell(rPos);
@@ -789,7 +789,7 @@ bool ScSimpleBootstrapFixture::checkFormulaPosition(ScDocument& rDoc, const ScAd
return true;
}
bool ScSimpleBootstrapFixture::checkFormulaPositions(
bool ScUcalcTestBase::checkFormulaPositions(
ScDocument& rDoc, SCTAB nTab, SCCOL nCol, const SCROW* pRows, size_t nRowCount)
{
ScAddress aPos(nCol, 0, nTab);
@@ -808,7 +808,7 @@ bool ScSimpleBootstrapFixture::checkFormulaPositions(
return true;
}
std::unique_ptr<ScTokenArray> ScSimpleBootstrapFixture::compileFormula(
std::unique_ptr<ScTokenArray> ScUcalcTestBase::compileFormula(
ScDocument* pDoc, const OUString& rFormula,
formula::FormulaGrammar::Grammar eGram )
{
@@ -817,7 +817,7 @@ std::unique_ptr<ScTokenArray> ScSimpleBootstrapFixture::compileFormula(
return aComp.CompileString(rFormula);
}
void ScSimpleBootstrapFixture::clearFormulaCellChangedFlag( ScDocument& rDoc, const ScRange& rRange )
void ScUcalcTestBase::clearFormulaCellChangedFlag( ScDocument& rDoc, const ScRange& rRange )
{
const ScAddress& s = rRange.aStart;
const ScAddress& e = rRange.aEnd;
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index aa44f6c..a8b48f9 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -102,7 +102,7 @@ public:
~FormulaGrammarSwitch();
};
class SCQAHELPER_DLLPUBLIC ScSimpleBootstrapFixture : public test::BootstrapFixture
class SCQAHELPER_DLLPUBLIC ScUcalcTestBase : public test::BootstrapFixture
{
public:
virtual void setUp() override;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 3b41781..b94ccf7 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -79,7 +79,7 @@ struct HoriIterCheck
}
class Test : public ScSimpleBootstrapFixture
class Test : public ScUcalcTestBase
{
public:
void checkPrecisionAsShown(OUString& rCode, double fValue, double fExpectedRoundVal);
diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
index 0311147..b637d72 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
+++ b/sc/qa/unit/ucalc_condformat.cxx
@@ -86,7 +86,7 @@ sal_uInt32 addSingleCellCondFormat(ScDocument* pDoc, const ScAddress& rAddr, sal
}
class TestCondformat : public ScSimpleBootstrapFixture
class TestCondformat : public ScUcalcTestBase
{
public:
void testCondFormatINSDEL();
diff --git a/sc/qa/unit/ucalc_copypaste.cxx b/sc/qa/unit/ucalc_copypaste.cxx
index 6079565..b6062cb 100644
--- a/sc/qa/unit/ucalc_copypaste.cxx
+++ b/sc/qa/unit/ucalc_copypaste.cxx
@@ -32,7 +32,7 @@
#include <memory>
class TestCopyPaste : public ScSimpleBootstrapFixture
class TestCopyPaste : public ScUcalcTestBase
{
public:
void testCopyPaste();
@@ -340,7 +340,7 @@ void TestCopyPaste::printValuesAndFormulasInRange(ScDocument* pDoc, const ScRang
OUString TestCopyPaste::getRangeByName(const OUString& aRangeName)
{
return ScSimpleBootstrapFixture::getRangeByName(m_pDoc, aRangeName);
return ScUcalcTestBase::getRangeByName(m_pDoc, aRangeName);
}
ScAddress TestCopyPaste::setNote(SCCOL nCol, SCROW nRow, SCTAB nTab, OUString noteText)
diff --git a/sc/qa/unit/ucalc_datatransformation.cxx b/sc/qa/unit/ucalc_datatransformation.cxx
index 7f33aa2..b26604c 100644
--- a/sc/qa/unit/ucalc_datatransformation.cxx
+++ b/sc/qa/unit/ucalc_datatransformation.cxx
@@ -15,7 +15,7 @@
#include <svl/numformat.hxx>
#include <tools/time.hxx>
class ScDataTransformationTest : public ScSimpleBootstrapFixture
class ScDataTransformationTest : public ScUcalcTestBase
{
public:
@@ -994,7 +994,7 @@ void ScDataTransformationTest::testGetSecond()
void ScDataTransformationTest::setUp()
{
ScSimpleBootstrapFixture::setUp();
ScUcalcTestBase::setUp();
m_pDoc->InsertTab(0, "Tab");
}
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 248f398..3cc36c6 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -195,7 +195,7 @@ struct StrStrCheck {
}
class TestFormula : public ScSimpleBootstrapFixture
class TestFormula : public ScUcalcTestBase
{
public:
void testFormulaCreateStringFromTokens();
diff --git a/sc/qa/unit/ucalc_parallelism.cxx b/sc/qa/unit/ucalc_parallelism.cxx
index ee148f8..48efaf2 100644
--- a/sc/qa/unit/ucalc_parallelism.cxx
+++ b/sc/qa/unit/ucalc_parallelism.cxx
@@ -21,7 +21,7 @@
using namespace css;
using namespace css::uno;
class ScParallelismTest : public ScSimpleBootstrapFixture
class ScParallelismTest : public ScUcalcTestBase
{
public:
virtual void setUp() override;
@@ -89,7 +89,7 @@ void ScParallelismTest::setThreadingFlag( bool bSet )
void ScParallelismTest::setUp()
{
ScSimpleBootstrapFixture::setUp();
ScUcalcTestBase::setUp();
sc::FormulaGroupInterpreter::disableOpenCL_UnitTestsOnly();
@@ -104,7 +104,7 @@ void ScParallelismTest::tearDown()
if (!m_bThreadingFlagCfg)
setThreadingFlag(false);
ScSimpleBootstrapFixture::tearDown();
ScUcalcTestBase::tearDown();
}
void ScParallelismTest::testSUMIFS()
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index d0e8699..ad67ade 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -156,7 +156,7 @@ ScRange refreshGroups(ScDPCollection* pDPs, ScDPObject* pDPObj)
}
class TestPivottable : public ScSimpleBootstrapFixture
class TestPivottable : public ScUcalcTestBase
{
public:
/**
diff --git a/sc/qa/unit/ucalc_range.cxx b/sc/qa/unit/ucalc_range.cxx
index 30f8a1f..5ea2d2e 100644
--- a/sc/qa/unit/ucalc_range.cxx
+++ b/sc/qa/unit/ucalc_range.cxx
@@ -19,7 +19,7 @@
#include <rangeutl.hxx>
#include <refupdatecontext.hxx>
class ScRangeTest : public ScSimpleBootstrapFixture
class ScRangeTest : public ScUcalcTestBase
{
public:
CPPUNIT_TEST_SUITE(ScRangeTest);
diff --git a/sc/qa/unit/ucalc_rangelst.cxx b/sc/qa/unit/ucalc_rangelst.cxx
index 48d95dd..e0f4526 100644
--- a/sc/qa/unit/ucalc_rangelst.cxx
+++ b/sc/qa/unit/ucalc_rangelst.cxx
@@ -13,7 +13,7 @@
#include <rangelst.hxx>
class Test : public ScSimpleBootstrapFixture
class Test : public ScUcalcTestBase
{
public:
void testDeleteArea_4Ranges();
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index a5cb151..e77ac8d 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -26,7 +26,7 @@
#include <memory>
#include <string_view>
class TestSharedFormula : public ScSimpleBootstrapFixture
class TestSharedFormula : public ScUcalcTestBase
{
public:
void testSharedFormulas();
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index 26449c4..f71e0d6 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -31,7 +31,7 @@
#include <svx/svdpage.hxx>
#include <rtl/math.hxx>
class TestSort : public ScSimpleBootstrapFixture
class TestSort : public ScUcalcTestBase
{
public:
void testSort();
diff --git a/sc/qa/unit/ucalc_sparkline.cxx b/sc/qa/unit/ucalc_sparkline.cxx
index a68b399..807f9d8 100644
--- a/sc/qa/unit/ucalc_sparkline.cxx
+++ b/sc/qa/unit/ucalc_sparkline.cxx
@@ -21,7 +21,7 @@
using namespace css;
/** Test operation for sparklines, sparkline groups and attributes */
class SparklineTest : public ScSimpleBootstrapFixture
class SparklineTest : public ScUcalcTestBase
{
public:
void testAddSparkline();
