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

Remove shared mxComponent (test document) in scscenariosobj

Change-Id: If37b9fa10fd935c5273a817acbf7d2d2f7eeedb8
Reviewed-on: https://gerrit.libreoffice.org/48930Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst d3297c0c
...@@ -32,8 +32,6 @@ using namespace com::sun::star; ...@@ -32,8 +32,6 @@ using namespace com::sun::star;
namespace sc_apitest namespace sc_apitest
{ {
#define NUMBER_OF_TESTS 2
class ScScenariosObj : public CalcUnoApiTest, public apitest::XScenarios class ScScenariosObj : public CalcUnoApiTest, public apitest::XScenarios
{ {
public: public:
...@@ -52,13 +50,9 @@ public: ...@@ -52,13 +50,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 ScScenariosObj::nTest = 0;
uno::Reference<lang::XComponent> ScScenariosObj::mxComponent;
ScScenariosObj::ScScenariosObj() ScScenariosObj::ScScenariosObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
...@@ -66,10 +60,6 @@ ScScenariosObj::ScScenariosObj() ...@@ -66,10 +60,6 @@ ScScenariosObj::ScScenariosObj()
uno::Reference<uno::XInterface> ScScenariosObj::init() uno::Reference<uno::XInterface> ScScenariosObj::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());
...@@ -95,19 +85,14 @@ uno::Reference<uno::XInterface> ScScenariosObj::init() ...@@ -95,19 +85,14 @@ uno::Reference<uno::XInterface> ScScenariosObj::init()
void ScScenariosObj::setUp() void ScScenariosObj::setUp()
{ {
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
// create a calc document
mxComponent = loadFromDesktop("private:factory/scalc");
} }
void ScScenariosObj::tearDown() void ScScenariosObj::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