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

Remove shared mxComponent (test document) in sctablevalidationobj

Change-Id: I94900cd87e61b5ee6618ccb736bee82c349c8cc3
Reviewed-on: https://gerrit.libreoffice.org/48942Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst deaa16bd
...@@ -29,8 +29,6 @@ using namespace com::sun::star; ...@@ -29,8 +29,6 @@ using namespace com::sun::star;
namespace sc_apitest namespace sc_apitest
{ {
#define NUMBER_OF_TESTS 5
class ScTableValidationObj : public CalcUnoApiTest, class ScTableValidationObj : public CalcUnoApiTest,
public apitest::TableValidation, public apitest::TableValidation,
public apitest::XSheetCondition public apitest::XSheetCondition
...@@ -56,13 +54,9 @@ public: ...@@ -56,13 +54,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 ScTableValidationObj::nTest = 0;
uno::Reference<lang::XComponent> ScTableValidationObj::mxComponent;
ScTableValidationObj::ScTableValidationObj() ScTableValidationObj::ScTableValidationObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
...@@ -70,10 +64,6 @@ ScTableValidationObj::ScTableValidationObj() ...@@ -70,10 +64,6 @@ ScTableValidationObj::ScTableValidationObj()
uno::Reference<uno::XInterface> ScTableValidationObj::init() uno::Reference<uno::XInterface> ScTableValidationObj::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());
...@@ -93,19 +83,14 @@ uno::Reference<uno::XInterface> ScTableValidationObj::init() ...@@ -93,19 +83,14 @@ uno::Reference<uno::XInterface> ScTableValidationObj::init()
void ScTableValidationObj::setUp() void ScTableValidationObj::setUp()
{ {
nTest++;
CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
// create a calc document
mxComponent = loadFromDesktop("private:factory/scalc");
} }
void ScTableValidationObj::tearDown() void ScTableValidationObj::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