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

[Stephan Bergmann]

 sc/qa/extras/scoutlineobj.cxx    |   10 +++++-----
 test/source/calc_unoapi_test.cxx |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 01d9f3fbeeb2a8f63a614fbc1a66ffb5c80c624f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Nov 9 15:14:22 2013 +0100

    The ScOutlineObj test still requires the fugdge
    
    ...that got moved from UnoApiTest to CalcUnoApiTest in
    a071a29d4f7e8065a36a313027a007edac102e20 "UnoApiTest don't require Calc."
    
    Change-Id: I1a38c496ef2baf42b5fd82ff653e822a8b80a124

diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx
index 1e0479a..0d6183e 100644
--- a/sc/qa/extras/scoutlineobj.cxx
+++ b/sc/qa/extras/scoutlineobj.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/unoapi_test.hxx>
+#include <test/calc_unoapi_test.hxx>
 #include <test/sheet/xsheetoutline.hxx>
 
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -20,7 +20,7 @@ namespace sc_apitest {
 
 #define NUMBER_OF_TESTS 6
 
-class ScOutlineObj : public UnoApiTest, apitest::XSheetOutline
+class ScOutlineObj : public CalcUnoApiTest, apitest::XSheetOutline
 {
 public:
     ScOutlineObj();
@@ -49,7 +49,7 @@ sal_Int32 ScOutlineObj::nTest = 0;
 uno::Reference< lang::XComponent > ScOutlineObj::mxComponent;
 
 ScOutlineObj::ScOutlineObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
 {
 }
 
@@ -73,7 +73,7 @@ uno::Reference< uno::XInterface > ScOutlineObj::init()
 void ScOutlineObj::setUp()
 {
     nTest++;
-    UnoApiTest::setUp();
+    CalcUnoApiTest::setUp();
 }
 
 void ScOutlineObj::tearDown()
@@ -81,7 +81,7 @@ void ScOutlineObj::tearDown()
     if (nTest == NUMBER_OF_TESTS)
         closeDocument(mxComponent);
 
-    UnoApiTest::tearDown();
+    CalcUnoApiTest::tearDown();
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScOutlineObj);
commit fe2e43280fc2007dcc819285270b2437ba56b8e3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Nov 9 15:11:17 2013 +0100

    Don't dispose twice in CalcUnoApiTest::tearDown
    
    ...i.e., skip UnoApiTest::tearDown's dispose of mxDesktop and go directly to
    BootstrapFixture::tearDown.
    
    Change-Id: If4555c812cb42c4b76a36d4e59c1d96211915dba

diff --git a/test/source/calc_unoapi_test.cxx b/test/source/calc_unoapi_test.cxx
index 8d7e218..f80e659 100644
--- a/test/source/calc_unoapi_test.cxx
+++ b/test/source/calc_unoapi_test.cxx
@@ -31,7 +31,7 @@ void CalcUnoApiTest::setUp()
 void CalcUnoApiTest::tearDown()
 {
     uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW )->dispose();
-    UnoApiTest::tearDown();
+    test::BootstrapFixture::tearDown();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */