sc/CppunitTest_sc_tiledrendering.mk | 1
sc/qa/unit/tiledrendering/tiledrendering.cxx | 73 ++++++---------------------
2 files changed, 19 insertions(+), 55 deletions(-)
New commits:
commit 0dfe66b1d3b6b55cd8fcf76a8290dcd6f6a1a329
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Oct 26 13:02:29 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Oct 26 14:04:12 2022 +0200
CppunitTest_sc_tiledrendering: inherit from UnoApiTest
Change-Id: Ie1574d2a84700a1f5c6adf4436ed6f6394dfbe6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141871
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/CppunitTest_sc_tiledrendering.mk
b/sc/CppunitTest_sc_tiledrendering.mk
index 7d194c29863f..93e10f794b2a 100644
--- a/sc/CppunitTest_sc_tiledrendering.mk
+++ b/sc/CppunitTest_sc_tiledrendering.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_tiledrendering,
\
sc \
scfilt \
scui \
+ subsequenttest \
test \
unotest \
$(call gb_Helper_optional,SCRIPTING, \
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 2a8a112e5b94..f288e1ffc538 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -7,9 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/bootstrapfixture.hxx>
+#include <test/unoapi_test.hxx>
#include <test/helper/transferable.hxx>
-#include <unotest/macros_test.hxx>
#include <test/xmltesttools.hxx>
#include <boost/property_tree/json_parser.hpp>
@@ -64,9 +63,7 @@ static std::ostream& operator<<(std::ostream& os, ViewShellId
const & id)
namespace
{
-constexpr OUStringLiteral DATA_DIRECTORY = u"/sc/qa/unit/tiledrendering/data/";
-
-class ScTiledRenderingTest : public test::BootstrapFixture, public
unotest::MacrosTest, public XmlTestTools
+class ScTiledRenderingTest : public UnoApiTest, public XmlTestTools
{
public:
ScTiledRenderingTest();
@@ -194,81 +191,48 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- ScModelObj* createDoc(const char* pName, bool bMakeTempCopy = false);
+ ScModelObj* createDoc(const char* pName);
void setupLibreOfficeKitViewCallback(SfxViewShell* pViewShell);
static void callback(int nType, const char* pPayload, void* pData);
void callbackImpl(int nType, const char* pPayload);
- void makeTempCopy(const OUString& rOrigURL);
/// document size changed callback.
osl::Condition m_aDocSizeCondition;
Size m_aDocumentSize;
- uno::Reference<lang::XComponent> mxComponent;
TestLokCallbackWrapper m_callbackWrapper;
- std::unique_ptr<utl::TempFileNamed> mpTempFile;
};
ScTiledRenderingTest::ScTiledRenderingTest()
- : m_callbackWrapper(&callback, this)
+ : UnoApiTest("/sc/qa/unit/tiledrendering/data/"),
+ m_callbackWrapper(&callback, this)
{
}
void ScTiledRenderingTest::setUp()
{
- test::BootstrapFixture::setUp();
+ UnoApiTest::setUp();
comphelper::LibreOfficeKit::setActive(true);
-
-
mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
}
void ScTiledRenderingTest::tearDown()
{
if (mxComponent.is())
{
- ScModelObj* pModelObj = static_cast<ScModelObj*>(mxComponent.get());
- ScDocShell* pDocSh = dynamic_cast< ScDocShell* >(
pModelObj->GetEmbeddedObject() );
- if (pDocSh)
- {
- ScTabViewShell* pViewShell = pDocSh->GetBestViewShell(false);
- if (pViewShell)
- {
- // The current view is unregistered here, multiple views have
to be unregistered
- // in the test function itself.
- pViewShell->setLibreOfficeKitViewCallback(nullptr);
- }
- }
mxComponent->dispose();
+ mxComponent.clear();
}
+
m_callbackWrapper.clear();
comphelper::LibreOfficeKit::setActive(false);
- test::BootstrapFixture::tearDown();
-}
-
-void ScTiledRenderingTest::makeTempCopy(const OUString& rOrigURL)
-{
- mpTempFile.reset(new utl::TempFileNamed());
- mpTempFile->EnableKillingFile();
- auto const aError = osl::File::copy(rOrigURL, mpTempFile->GetURL());
- CPPUNIT_ASSERT_EQUAL_MESSAGE(
- OUString("<" + rOrigURL + "> -> <" + mpTempFile->GetURL() +
">").toUtf8().getStr(),
- osl::FileBase::E_None, aError);
+ UnoApiTest::tearDown();
}
-ScModelObj* ScTiledRenderingTest::createDoc(const char* pName, bool
bMakeTempCopy)
+ScModelObj* ScTiledRenderingTest::createDoc(const char* pName)
{
- if (mxComponent.is())
- mxComponent->dispose();
-
- OUString aOriginalSrc = m_directories.getURLFromSrc(DATA_DIRECTORY) +
OUString::createFromAscii(pName);
- if (bMakeTempCopy)
- makeTempCopy(aOriginalSrc);
-
- mxComponent = loadFromDesktop(
- bMakeTempCopy ? mpTempFile->GetURL() : aOriginalSrc,
- "com.sun.star.sheet.SpreadsheetDocument");
+ loadFromURL(OUString::createFromAscii(pName));
ScModelObj* pModelObj = dynamic_cast<ScModelObj*>(mxComponent.get());
CPPUNIT_ASSERT(pModelObj);
@@ -1478,7 +1442,7 @@ void
ScTiledRenderingTest::testInsertGraphicInvalidations()
// insert an image in view and see if both views are invalidated
aView.m_bInvalidateTiles = false;
uno::Sequence<beans::PropertyValue> aArgs(
comphelper::InitPropertySequence({
- { "FileName", uno::Any(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "smile.png") }
+ { "FileName", uno::Any(createFileURL(u"smile.png")) }
}));
comphelper::dispatchCommand(".uno:InsertGraphic", aArgs);
Scheduler::ProcessEventsToIdle();
@@ -2835,8 +2799,6 @@ void ScTiledRenderingTest::testSheetViewDataCrash()
void ScTiledRenderingTest::testTextBoxInsert()
{
- comphelper::LibreOfficeKit::setActive();
-
createDoc("empty.ods");
ViewCallback aView1;
@@ -2857,8 +2819,6 @@ void ScTiledRenderingTest::testTextBoxInsert()
void ScTiledRenderingTest::testCommentCellCopyPaste()
{
- // Load a document
- comphelper::LibreOfficeKit::setActive();
// Comments callback are emitted only if tiled annotations are off
comphelper::LibreOfficeKit::setTiledAnnotations(false);
@@ -2956,10 +2916,13 @@ void ScTiledRenderingTest::testCommentCellCopyPaste()
void ScTiledRenderingTest::testInvalidEntrySave()
{
- // Load a document
- comphelper::LibreOfficeKit::setActive();
+ loadFromURL(u"validity.xlsx");
- ScModelObj* pModelObj = createDoc("validity.xlsx", true /* bMakeTempCopy
*/);
+ // .uno:Save modifies the original file, make a copy first
+ saveAndReload("Calc Office Open XML");
+ ScModelObj* pModelObj = dynamic_cast<ScModelObj*>(mxComponent.get());
+ CPPUNIT_ASSERT(pModelObj);
+
pModelObj->initializeForTiledRendering(uno::Sequence<beans::PropertyValue>());
const ScDocument* pDoc = pModelObj->GetDocument();
ViewCallback aView;
int nView = SfxLokHelper::getView();
