qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv |    3 
 sc/CppunitTest_sc_ddelinksobj.mk                              |   44 ++++
 sc/Module_sc.mk                                               |    1 
 sc/qa/extras/scddelinksobj.cxx                                |  109 ++++++++++
 4 files changed, 154 insertions(+), 3 deletions(-)

New commits:
commit 0ea7692d02518561b6bc07bb920ae619678f020f
Author:     Jens Carl <j.car...@gmx.de>
AuthorDate: Thu Jan 17 22:46:38 2019 +0000
Commit:     Jens Carl <j.car...@gmx.de>
CommitDate: Fri Jan 18 00:46:23 2019 +0100

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

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv
index 078a30a93b0e..60819c0d0117 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDDELinksObj.csv
@@ -1,6 +1,3 @@
-"ScDDELinksObj";"com::sun::star::container::XNameAccess";"getByName()"
-"ScDDELinksObj";"com::sun::star::container::XNameAccess";"getElementNames()"
-"ScDDELinksObj";"com::sun::star::container::XNameAccess";"hasByName()"
 "ScDDELinksObj";"com::sun::star::container::XIndexAccess";"getCount()"
 "ScDDELinksObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
 "ScDDELinksObj";"com::sun::star::container::XElementAccess";"getElementType()"
diff --git a/sc/CppunitTest_sc_ddelinksobj.mk b/sc/CppunitTest_sc_ddelinksobj.mk
new file mode 100644
index 000000000000..73fd02a9147a
--- /dev/null
+++ b/sc/CppunitTest_sc_ddelinksobj.mk
@@ -0,0 +1,44 @@
+# -*- 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_ddelinksobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_ddelinksobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_ddelinksobj, \
+       sc/qa/extras/scddelinksobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_ddelinksobj, \
+       cppu \
+       sal \
+       subsequenttest \
+       test \
+       unotest \
+       vcl \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_ddelinksobj,\
+       $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_ddelinksobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_ddelinksobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_ddelinksobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_ddelinksobj,\
+    $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_ddelinksobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 761511caca05..53c729e5ce78 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -129,6 +129,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
        CppunitTest_sc_datapilottableobj \
        CppunitTest_sc_datapilottablesobj \
        CppunitTest_sc_ddelinkobj \
+       CppunitTest_sc_ddelinksobj \
        CppunitTest_sc_documentconfigurationobj \
        CppunitTest_sc_editfieldobj_cell \
        CppunitTest_sc_editfieldobj_header \
diff --git a/sc/qa/extras/scddelinksobj.cxx b/sc/qa/extras/scddelinksobj.cxx
new file mode 100644
index 000000000000..d6f9c8bd462c
--- /dev/null
+++ b/sc/qa/extras/scddelinksobj.cxx
@@ -0,0 +1,109 @@
+/* -*- 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/container/xnameaccess.hxx>
+
+#include <rtl/ustring.hxx>
+#include <sfx2/app.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/sheet/XDDELinks.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/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+using namespace css::uno;
+using namespace com::sun::star;
+
+namespace sc_apitest
+{
+class ScDDELinksObj : public CalcUnoApiTest, public apitest::XNameAccess
+{
+public:
+    ScDDELinksObj();
+
+    virtual uno::Reference<uno::XInterface> init() override;
+    virtual void setUp() override;
+    virtual void tearDown() override;
+
+    CPPUNIT_TEST_SUITE(ScDDELinksObj);
+
+    // XNameAccess
+    CPPUNIT_TEST(testGetByName);
+    CPPUNIT_TEST(testGetElementNames);
+    CPPUNIT_TEST(testHasByName);
+
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+    uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScDDELinksObj::ScDDELinksObj()
+    : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+    , XNameAccess("soffice|"
+                  + 
m_directories.getURLFromSrc("/sc/qa/unoapi/testdocuments/ScDDELinksObj.ods")
+                  + "!Sheet1.A1")
+{
+}
+
+uno::Reference<uno::XInterface> ScDDELinksObj::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> xSheet(xIA->getByIndex(0), 
uno::UNO_QUERY_THROW);
+
+    const OUString testdoc
+        = 
m_directories.getURLFromSrc("/sc/qa/unoapi/testdocuments/ScDDELinksObj.ods");
+
+    xSheet->getCellByPosition(5, 5)->setFormula("=DDE(\"soffice\";\"" + testdoc
+                                                + "\";\"Sheet1.A1\")");
+    xSheet->getCellByPosition(1, 4)->setFormula("=DDE(\"soffice\";\"" + testdoc
+                                                + "\";\"Sheet1.A1\")");
+    xSheet->getCellByPosition(2, 0)->setFormula("=DDE(\"soffice\";\"" + testdoc
+                                                + "\";\"Sheet1.A1\")");
+
+    uno::Reference<beans::XPropertySet> xPropSet(xDoc, uno::UNO_QUERY_THROW);
+    uno::Any aDDELinks = xPropSet->getPropertyValue("DDELinks");
+    uno::Reference<sheet::XDDELinks> xDDELinks(aDDELinks, 
uno::UNO_QUERY_THROW);
+
+    return xDDELinks;
+}
+
+void ScDDELinksObj::setUp()
+{
+    Application::SetAppName("soffice"); // Enable DDE
+    CalcUnoApiTest::setUp();
+    // create a calc document
+    m_xComponent = loadFromDesktop("private:factory/scalc");
+}
+
+void ScDDELinksObj::tearDown()
+{
+    closeDocument(m_xComponent);
+    CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScDDELinksObj);
+
+} // 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