[Libreoffice-commits] core.git: sc/qa test/source

[Jens Carl]

 sc/qa/extras/sctablesheetsobj.cxx   |   35 ++++++++++++-----------------------
 test/source/sheet/xspreadsheets.cxx |    2 +-
 2 files changed, 13 insertions(+), 24 deletions(-)

New commits:
commit 740137d8ccc50fea073224cc7e69173676536f5e
Author: Jens Carl <j.carl43 at gmx.de>
Date:   Wed Jan 31 21:19:55 2018 +0000

    Remove shared mxComponent (test document) in sctablesheetsobj
    
    Change-Id: I3fb21aaebf97a143954f84e5d41415f58ecd9326
    Reviewed-on: https://gerrit.libreoffice.org/49062
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index 597f1ac6e270..a1152fa5cf08 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -8,9 +8,9 @@
  */
 
 #include <test/calc_unoapi_test.hxx>
+#include <test/container/xnamecontainer.hxx>
 #include <test/sheet/xspreadsheets.hxx>
 #include <test/sheet/xspreadsheets2.hxx>
-#include <test/container/xnamecontainer.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -20,8 +20,6 @@ using namespace css::uno;
 
 namespace sc_apitest {
 
-#define NUMBER_OF_TESTS 15
-
 class ScTableSheetsObj : public CalcUnoApiTest, public ::apitest::XSpreadsheets, public ::apitest::XSpreadsheets2, public apitest::XNameContainer
 {
 public:
@@ -31,11 +29,13 @@ public:
     virtual void tearDown() override;
 
     CPPUNIT_TEST_SUITE(ScTableSheetsObj);
+
     // XSpreadsheets
     CPPUNIT_TEST(testInsertNewByName);
     CPPUNIT_TEST(testInsertNewByNameBadName);
     CPPUNIT_TEST(testCopyByName);
     CPPUNIT_TEST(testMoveByName);
+
     // XSpreadsheets2
     CPPUNIT_TEST(testImportedSheetNameAndIndex);
     CPPUNIT_TEST(testImportString);
@@ -47,7 +47,10 @@ public:
     CPPUNIT_TEST(testImportNamedRangeRedefinedInSource);
     CPPUNIT_TEST(testImportNewNamedRange);
     CPPUNIT_TEST(testImportCellStyle);
+
+    // XNameContainer
     CPPUNIT_TEST(testRemoveByName);
+
     CPPUNIT_TEST_SUITE_END();
 
     virtual uno::Reference< lang::XComponent > getComponent() override;
@@ -55,18 +58,13 @@ public:
     virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString) override;
     virtual uno::Reference< uno::XInterface > init() override;
 protected:
-    static uno::Reference< lang::XComponent > mxComponent;
-    static sal_Int32 nTest;
+    uno::Reference< lang::XComponent > mxComponent;
 };
 
-uno::Reference< lang::XComponent > ScTableSheetsObj::mxComponent;
-sal_Int32 ScTableSheetsObj::nTest = 0;
-
 ScTableSheetsObj::ScTableSheetsObj():
             CalcUnoApiTest("/sc/qa/extras/testdocuments"),
             apitest::XNameContainer("Sheet2")
 {
-
 }
 
 uno::Reference< lang::XComponent > ScTableSheetsObj::getComponent()
@@ -86,12 +84,6 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const OUStr
 
 uno::Reference< uno::XInterface > ScTableSheetsObj::init()
 {
-    OUString aFileURL;
-    createFileURL("rangenamessrc.ods", aFileURL);
-    if(!mxComponent.is())
-        mxComponent = loadFromDesktop(aFileURL);
-    CPPUNIT_ASSERT_MESSAGE("no component loaded", mxComponent.is());
-
     xDocument.set(mxComponent, UNO_QUERY_THROW);
     uno::Reference< uno::XInterface > xReturn( xDocument->getSheets(), UNO_QUERY_THROW);
 
@@ -100,19 +92,16 @@ uno::Reference< uno::XInterface > ScTableSheetsObj::init()
 
 void ScTableSheetsObj::setUp()
 {
-    nTest++;
-    CPPUNIT_ASSERT(nTest <= NUMBER_OF_TESTS);
     CalcUnoApiTest::setUp();
+    // create a calc document
+    OUString aFileURL;
+    createFileURL("rangenamessrc.ods", aFileURL);
+    mxComponent = loadFromDesktop(aFileURL);
 }
 
 void ScTableSheetsObj::tearDown()
 {
-    if (nTest == NUMBER_OF_TESTS)
-    {
-        closeDocument(mxComponent);
-        mxComponent.clear();
-    }
-
+    closeDocument(mxComponent);
     CalcUnoApiTest::tearDown();
 }
 
diff --git a/test/source/sheet/xspreadsheets.cxx b/test/source/sheet/xspreadsheets.cxx
index 75a4c2519017..3f30bfc3da22 100644
--- a/test/source/sheet/xspreadsheets.cxx
+++ b/test/source/sheet/xspreadsheets.cxx
@@ -50,7 +50,7 @@ void XSpreadsheets::testMoveByName()
     xSpreadsheets->insertNewByName("SheetToMove", 0);
     uno::Reference< container::XNameAccess > xNameAccess(xSpreadsheets, UNO_QUERY_THROW);
     CPPUNIT_ASSERT_MESSAGE("Sheet to move was not insert",
-                           xNameAccess->hasByName("SheetToCopySrc"));
+                           xNameAccess->hasByName("SheetToMove"));
 
     xSpreadsheets->moveByName("SheetToMove", 2);