Kaydet (Commit) 96a47c60 authored tarafından Jens Carl's avatar Jens Carl

Remove shared mxComponent (test document) in scviewpaneobj

Change-Id: I8bf7adb11e49d926a5910a4bd8279e16cf34833f
Reviewed-on: https://gerrit.libreoffice.org/48943Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst 00bf3c83
...@@ -23,8 +23,6 @@ using namespace css::uno; ...@@ -23,8 +23,6 @@ using namespace css::uno;
namespace sc_apitest { namespace sc_apitest {
#define NUMBER_OF_TESTS 3
class ScViewPaneObj : public CalcUnoApiTest, public apitest::XViewPane class ScViewPaneObj : public CalcUnoApiTest, public apitest::XViewPane
{ {
public: public:
...@@ -35,32 +33,25 @@ public: ...@@ -35,32 +33,25 @@ public:
virtual void tearDown() override; virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScViewPaneObj); CPPUNIT_TEST_SUITE(ScViewPaneObj);
// XViewPane
CPPUNIT_TEST(testFirstVisibleColumn); CPPUNIT_TEST(testFirstVisibleColumn);
CPPUNIT_TEST(testFirstVisibleRow); CPPUNIT_TEST(testFirstVisibleRow);
CPPUNIT_TEST(testVisibleRange); CPPUNIT_TEST(testVisibleRange);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
uno::Reference<lang::XComponent> mxComponent;
static sal_Int32 nTest;
static uno::Reference<lang::XComponent> mxComponent;
}; };
sal_Int32 ScViewPaneObj::nTest = 0;
uno::Reference< lang::XComponent > ScViewPaneObj::mxComponent;
ScViewPaneObj::ScViewPaneObj() ScViewPaneObj::ScViewPaneObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
} }
uno::Reference< uno::XInterface > ScViewPaneObj::init() uno::Reference< uno::XInterface > ScViewPaneObj::init()
{ {
// create a calc document
if (!mxComponent.is())
mxComponent = loadFromDesktop("private:factory/scalc");
uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document!", xSheetDoc.is()); CPPUNIT_ASSERT_MESSAGE("no calc document!", xSheetDoc.is());
...@@ -73,19 +64,14 @@ uno::Reference< uno::XInterface > ScViewPaneObj::init() ...@@ -73,19 +64,14 @@ uno::Reference< uno::XInterface > ScViewPaneObj::init()
void ScViewPaneObj::setUp() void ScViewPaneObj::setUp()
{ {
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
// create a calc document
mxComponent = loadFromDesktop("private:factory/scalc");
} }
void ScViewPaneObj::tearDown() void ScViewPaneObj::tearDown()
{ {
if (nTest == NUMBER_OF_TESTS) closeDocument(mxComponent);
{
closeDocument(mxComponent);
mxComponent.clear();
}
CalcUnoApiTest::tearDown(); CalcUnoApiTest::tearDown();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment