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

Remove shared mxComponent (test document) in sclabelrangesobj

Change-Id: I79fb234a55fa03cd0c45bcc22903963f2a353fe5
Reviewed-on: https://gerrit.libreoffice.org/48920Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst 1a8aedb9
...@@ -25,8 +25,6 @@ using namespace com::sun::star; ...@@ -25,8 +25,6 @@ using namespace com::sun::star;
namespace sc_apitest namespace sc_apitest
{ {
#define NUMBER_OF_TESTS 2
class ScLabelRangesObj : public CalcUnoApiTest, public apitest::XLabelRanges class ScLabelRangesObj : public CalcUnoApiTest, public apitest::XLabelRanges
{ {
public: public:
...@@ -45,13 +43,9 @@ public: ...@@ -45,13 +43,9 @@ public:
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
private: private:
static sal_Int32 nTest; uno::Reference<lang::XComponent> mxComponent;
static uno::Reference<lang::XComponent> mxComponent;
}; };
sal_Int32 ScLabelRangesObj::nTest = 0;
uno::Reference<lang::XComponent> ScLabelRangesObj::mxComponent;
ScLabelRangesObj::ScLabelRangesObj() ScLabelRangesObj::ScLabelRangesObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
...@@ -59,10 +53,6 @@ ScLabelRangesObj::ScLabelRangesObj() ...@@ -59,10 +53,6 @@ ScLabelRangesObj::ScLabelRangesObj()
uno::Reference<uno::XInterface> ScLabelRangesObj::init() uno::Reference<uno::XInterface> ScLabelRangesObj::init()
{ {
// create a calc document
if (!mxComponent.is())
mxComponent = loadFromDesktop("private:factory/scalc");
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
...@@ -79,19 +69,14 @@ uno::Reference<uno::XInterface> ScLabelRangesObj::init() ...@@ -79,19 +69,14 @@ uno::Reference<uno::XInterface> ScLabelRangesObj::init()
void ScLabelRangesObj::setUp() void ScLabelRangesObj::setUp()
{ {
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
// create a calc document
mxComponent = loadFromDesktop("private:factory/scalc");
} }
void ScLabelRangesObj::tearDown() void ScLabelRangesObj::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