diff options
| author | Jens Carl <j.carl43@gmx.de> | 2018-01-30 18:16:45 +0000 |
|---|---|---|
| committer | Jens Carl <j.carl43@gmx.de> | 2018-01-30 22:41:31 +0100 |
| commit | b7896ade3e54c6809f588c3f2deab02b3d803a26 (patch) | |
| tree | 37e95a5c8b7b85ac5c6f1482b80433b481efa675 | |
| parent | f8f4e9e605daf307a32531bbe8c89fd4575fea4e (diff) | |
Remove shared mxComponent (test document) in scnamedrangeobj
Change-Id: Ieb32cb4b4a4cc4c897ecbcdb29dd64bf5d31b28f
Reviewed-on: https://gerrit.libreoffice.org/48922
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Tested-by: Jens Carl <j.carl43@gmx.de>
| -rw-r--r-- | sc/qa/extras/scnamedrangeobj.cxx | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 49f7895c40a5..f0021cca3c9f 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -22,8 +22,6 @@ using namespace css::uno; namespace sc_apitest { -#define NUMBER_OF_TESTS 9 - class ScNamedRangeObj : public CalcUnoApiTest, public apitest::XNamedRange, public apitest::XNamed, public apitest::XCellRangeReferrer { public: @@ -36,6 +34,7 @@ public: virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName) override; CPPUNIT_TEST_SUITE(ScNamedRangeObj); + CPPUNIT_TEST(testGetContent); CPPUNIT_TEST(testSetContent); CPPUNIT_TEST(testGetType); @@ -45,17 +44,13 @@ public: CPPUNIT_TEST(testSetName); CPPUNIT_TEST(testGetName); CPPUNIT_TEST(testGetReferredCells); + CPPUNIT_TEST_SUITE_END(); private: uno::Reference< sheet::XNamedRanges > init_impl(); - - static sal_Int32 nTest; - static uno::Reference< lang::XComponent > mxComponent; + uno::Reference< lang::XComponent > mxComponent; }; -sal_Int32 ScNamedRangeObj::nTest = 0; -uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent; - ScNamedRangeObj::ScNamedRangeObj(): CalcUnoApiTest("/sc/qa/extras/testdocuments"), apitest::XNamed("NamedRange"), @@ -65,10 +60,6 @@ ScNamedRangeObj::ScNamedRangeObj(): uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() { - OUString aFileURL; - createFileURL("ScNamedRangeObj.ods", aFileURL); - if(!mxComponent.is()) - mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT_MESSAGE("no component loaded", mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); @@ -94,19 +85,16 @@ uno::Reference< uno::XInterface > ScNamedRangeObj::init() void ScNamedRangeObj::setUp() { - nTest++; - CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS); CalcUnoApiTest::setUp(); + // create a calc document + OUString aFileURL; + createFileURL("ScNamedRangeObj.ods", aFileURL); + mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); } void ScNamedRangeObj::tearDown() { - if (nTest == NUMBER_OF_TESTS) - { - closeDocument(mxComponent); - mxComponent.clear(); - } - + closeDocument(mxComponent); CalcUnoApiTest::tearDown(); } |