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

tdf#45904 Rename test object for GlobalSheetSettings

Rename test object ScSpreadsheetSettingsObj to ScSpreadsheetSettings.

Change-Id: Ia70cc82e0ee20571ad029590db735f932e5c7958
Reviewed-on: https://gerrit.libreoffice.org/51723Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJens Carl <j.carl43@gmx.de>
üst fa28a491
...@@ -9,15 +9,15 @@ ...@@ -9,15 +9,15 @@
# #
#************************************************************************* #*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,sc_spreadsheetsettingsobj)) $(eval $(call gb_CppunitTest_CppunitTest,sc_spreadsheetsettings))
$(eval $(call gb_CppunitTest_use_external,sc_spreadsheetsettingsobj,boost_headers)) $(eval $(call gb_CppunitTest_use_external,sc_spreadsheetsettings,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetsettingsobj, \ $(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetsettings, \
sc/qa/extras/scspreadsheetsettingsobj \ sc/qa/extras/scspreadsheetsettings \
)) ))
$(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsettingsobj, \ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsettings, \
basegfx \ basegfx \
comphelper \ comphelper \
cppu \ cppu \
...@@ -52,21 +52,21 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsettingsobj, \ ...@@ -52,21 +52,21 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsettingsobj, \
xo \ xo \
)) ))
$(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsettingsobj,\ $(eval $(call gb_CppunitTest_set_include,sc_spreadsheetsettings,\
-I$(SRCDIR)/sc/source/ui/inc \ -I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/inc \ -I$(SRCDIR)/sc/inc \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_CppunitTest_use_sdk_api,sc_spreadsheetsettingsobj)) $(eval $(call gb_CppunitTest_use_sdk_api,sc_spreadsheetsettings))
$(eval $(call gb_CppunitTest_use_ure,sc_spreadsheetsettingsobj)) $(eval $(call gb_CppunitTest_use_ure,sc_spreadsheetsettings))
$(eval $(call gb_CppunitTest_use_vcl,sc_spreadsheetsettingsobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_spreadsheetsettings))
$(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsettingsobj,\ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsettings,\
$(sc_unoapi_common_components) \ $(sc_unoapi_common_components) \
)) ))
$(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetsettingsobj)) $(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetsettings))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -153,7 +153,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ ...@@ -153,7 +153,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_autoformatobj \ CppunitTest_sc_autoformatobj \
CppunitTest_sc_importdescriptorbaseobj \ CppunitTest_sc_importdescriptorbaseobj \
CppunitTest_sc_documentconfigurationobj \ CppunitTest_sc_documentconfigurationobj \
CppunitTest_sc_spreadsheetsettingsobj \ CppunitTest_sc_spreadsheetsettings \
CppunitTest_sc_shapeobj \ CppunitTest_sc_shapeobj \
CppunitTest_sc_sheetlinkobj \ CppunitTest_sc_sheetlinkobj \
)) ))
......
...@@ -23,16 +23,16 @@ using namespace com::sun::star; ...@@ -23,16 +23,16 @@ using namespace com::sun::star;
namespace sc_apitest namespace sc_apitest
{ {
class ScSpreadsheetSettingsObj : public CalcUnoApiTest, public apitest::GlobalSheetSettings class ScSpreadsheetSettings : public CalcUnoApiTest, public apitest::GlobalSheetSettings
{ {
public: public:
ScSpreadsheetSettingsObj(); ScSpreadsheetSettings();
virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> init() override;
virtual void setUp() override; virtual void setUp() override;
virtual void tearDown() override; virtual void tearDown() override;
CPPUNIT_TEST_SUITE(ScSpreadsheetSettingsObj); CPPUNIT_TEST_SUITE(ScSpreadsheetSettings);
// GlobalSheetSettings // GlobalSheetSettings
CPPUNIT_TEST(testGlobalSheetSettingsProperties); CPPUNIT_TEST(testGlobalSheetSettingsProperties);
...@@ -43,12 +43,12 @@ private: ...@@ -43,12 +43,12 @@ private:
uno::Reference<lang::XComponent> mxComponent; uno::Reference<lang::XComponent> mxComponent;
}; };
ScSpreadsheetSettingsObj::ScSpreadsheetSettingsObj() ScSpreadsheetSettings::ScSpreadsheetSettings()
: CalcUnoApiTest("/sc/qa/extras/testdocuments") : CalcUnoApiTest("/sc/qa/extras/testdocuments")
{ {
} }
uno::Reference<uno::XInterface> ScSpreadsheetSettingsObj::init() uno::Reference<uno::XInterface> ScSpreadsheetSettings::init()
{ {
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is()); CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
...@@ -57,20 +57,20 @@ uno::Reference<uno::XInterface> ScSpreadsheetSettingsObj::init() ...@@ -57,20 +57,20 @@ uno::Reference<uno::XInterface> ScSpreadsheetSettingsObj::init()
return xMSF->createInstance("com.sun.star.sheet.GlobalSheetSettings"); return xMSF->createInstance("com.sun.star.sheet.GlobalSheetSettings");
} }
void ScSpreadsheetSettingsObj::setUp() void ScSpreadsheetSettings::setUp()
{ {
CalcUnoApiTest::setUp(); CalcUnoApiTest::setUp();
// create a calc document // create a calc document
mxComponent = loadFromDesktop("private:factory/scalc"); mxComponent = loadFromDesktop("private:factory/scalc");
} }
void ScSpreadsheetSettingsObj::tearDown() void ScSpreadsheetSettings::tearDown()
{ {
closeDocument(mxComponent); closeDocument(mxComponent);
CalcUnoApiTest::tearDown(); CalcUnoApiTest::tearDown();
} }
CPPUNIT_TEST_SUITE_REGISTRATION(ScSpreadsheetSettingsObj); CPPUNIT_TEST_SUITE_REGISTRATION(ScSpreadsheetSettings);
} // end namespace } // end namespace
......
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