qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv |    7 
 sc/CppunitTest_sc_tablerowobj.mk                              |   43 +++
 sc/Module_sc.mk                                               |    1 
 sc/qa/extras/sctablerowobj.cxx                                |  124 ++++++++++
 4 files changed, 168 insertions(+), 7 deletions(-)

New commits:
commit ee268253163c4f9f00fd5182c97d9d488c637dfc
Author:     Jens Carl <j.car...@gmx.de>
AuthorDate: Tue Apr 2 20:50:56 2019 +0000
Commit:     Jens Carl <j.car...@gmx.de>
CommitDate: Tue Apr 2 23:53:32 2019 +0200

    tdf#45904 Move XPropertySet Java tests to C++
    
    Move XPropertySet Java tests to C++ for ScTableRowObj.
    
    Change-Id: Ib448d6440cd6a285cd55297669bb19bd8aec6b07
    Reviewed-on: https://gerrit.libreoffice.org/70156
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.car...@gmx.de>

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
index 23e159b4768a..59f7efd6554a 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableRowObj.csv
@@ -5,10 +5,3 @@
 "ScTableRowObj";"com::sun::star::table::XCellRange";"getCellByPosition()"
 "ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByPosition()"
 "ScTableRowObj";"com::sun::star::table::XCellRange";"getCellRangeByName()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScTableRowObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/sc/CppunitTest_sc_tablerowobj.mk b/sc/CppunitTest_sc_tablerowobj.mk
new file mode 100644
index 000000000000..861f6fd5ce3f
--- /dev/null
+++ b/sc/CppunitTest_sc_tablerowobj.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_tablerowobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_tablerowobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_tablerowobj, \
+       sc/qa/extras/sctablerowobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_tablerowobj, \
+       cppu \
+       sal \
+       subsequenttest \
+       test \
+       unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_tablerowobj,\
+       $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_tablerowobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_tablerowobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_tablerowobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_tablerowobj,\
+       $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_tablerowobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index b56484c798a5..8a7484a824dd 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -197,6 +197,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
        CppunitTest_sc_tablecolumnsobj \
        CppunitTest_sc_tableconditionalentryobj \
        CppunitTest_sc_tableconditionalformat \
+       CppunitTest_sc_tablerowobj \
        CppunitTest_sc_tablerowsobj \
        CppunitTest_sc_tablesheetobj \
        CppunitTest_sc_tablesheetsobj \
diff --git a/sc/qa/extras/sctablerowobj.cxx b/sc/qa/extras/sctablerowobj.cxx
new file mode 100644
index 000000000000..381c4dc3a78c
--- /dev/null
+++ b/sc/qa/extras/sctablerowobj.cxx
@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <test/calc_unoapi_test.hxx>
+#include <test/beans/xpropertyset.hxx>
+
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
+#include <com/sun/star/table/XColumnRowRange.hpp>
+#include <com/sun/star/table/XTableRows.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+
+namespace sc_apitest
+{
+class ScTableRowObj : public CalcUnoApiTest, public apitest::XPropertySet
+{
+public:
+    ScTableRowObj();
+
+    virtual uno::Reference<uno::XInterface> init() override;
+    virtual void setUp() override;
+    virtual void tearDown() override;
+
+    CPPUNIT_TEST_SUITE(ScTableRowObj);
+
+    // XPropertySet
+    CPPUNIT_TEST(testGetPropertySetInfo);
+    CPPUNIT_TEST(testGetPropertyValue);
+    CPPUNIT_TEST(testSetPropertyValue);
+    CPPUNIT_TEST(testPropertyChangeListener);
+    CPPUNIT_TEST(testVetoableChangeListener);
+
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+    uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScTableRowObj::ScTableRowObj()
+    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    , XPropertySet({ "BottomBorder",
+                     "BottomBorder2",
+                     "CellProtection",
+                     "CharLocale",
+                     "CharLocaleAsian",
+                     "CharLocaleComplex",
+                     "CharPosture",
+                     "CharPostureAsian",
+                     "CharPostureComplex",
+                     "ConditionalFormat",
+                     "ConditionalFormatLocal",
+                     "ConditionalFormatXML",
+                     "DiagonalBLTR",
+                     "DiagonalBLTR2",
+                     "DiagonalTLBR",
+                     "DiagonalTLBR2",
+                     "HoriJustify",
+                     "LeftBorder",
+                     "LeftBorder2",
+                     "NumberingRules",
+                     "Orientation",
+                     "RightBorder",
+                     "RightBorder2",
+                     "ShadowFormat",
+                     "TableBorder",
+                     "TableBorder2",
+                     "TopBorder",
+                     "TopBorder2",
+                     "UserDefinedAttributes",
+                     "Validation",
+                     "ValidationLocal",
+                     "ValidationXML",
+                     "WritingMode" })
+{
+}
+
+uno::Reference<uno::XInterface> ScTableRowObj::init()
+{
+    uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, 
uno::UNO_QUERY_THROW);
+    uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), 
uno::UNO_QUERY_THROW);
+    uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
+
+    uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), 
uno::UNO_QUERY_THROW);
+    uno::Reference<table::XColumnRowRange> xCRR(xSheet0, uno::UNO_QUERY_THROW);
+    uno::Reference<table::XTableRows> xTR(xCRR->getRows(), 
uno::UNO_QUERY_THROW);
+
+    uno::Reference<container::XIndexAccess> xIA_TR(xTR, uno::UNO_QUERY_THROW);
+    uno::Reference<uno::XInterface> xReturn(xIA_TR->getByIndex(6), 
uno::UNO_QUERY_THROW);
+    return xReturn;
+}
+
+void ScTableRowObj::setUp()
+{
+    CalcUnoApiTest::setUp();
+    // create calc document
+    m_xComponent = loadFromDesktop("private:factory/scalc");
+}
+
+void ScTableRowObj::tearDown()
+{
+    closeDocument(m_xComponent);
+    CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScTableRowObj);
+
+} // namespace sc_apitest
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to