framework/qa/complex/api_internal/api.lst
| 1
qadevOOo/Jar_OOoRunner.mk
| 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TextFieldEnumeration.csv
| 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
| 128 ----------
sc/CppunitTest_sc_indexenumeration_textfieldenumeration.mk
| 43 +++
sc/Module_sc.mk
| 1
sc/qa/extras/scindexenumeration_textfieldenumeration.cxx
| 102 +++++++
sc/qa/unoapi/sc_6.sce
| 1
8 files changed, 146 insertions(+), 133 deletions(-)
New commits:
commit fb036ee652cf2284a70036b3bf2948ef966cffb0
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Fri Nov 16 21:53:10 2018 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Sat Nov 17 00:40:20 2018 +0100
tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++ for
ScIndexEnumeration_TextFieldEnumeration.
Change-Id: I92e8c4779a22b6da1dabf5a24bbb76fe20ec398c
Reviewed-on: https://gerrit.libreoffice.org/63484
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index 60ea1a45e2d1..3ca131acc6dd 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -111,7 +111,6 @@ job116=sc.ScIndexEnumeration_TableAutoFormatEnumeration
job117=sc.ScIndexEnumeration_TableChartsEnumeration
job118=sc.ScIndexEnumeration_TableColumnsEnumeration
job119=sc.ScIndexEnumeration_TableConditionalEntryEnumeration
-job120=sc.ScIndexEnumeration_TextFieldEnumeration
job122=sc.ScLabelRangesObj
job125=sc.ScScenariosObj
job126=sc.ScSheetLinkObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 12f0796db58a..8c7409b3161b 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1010,7 +1010,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration
\
- qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration \
qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \
qadevOOo/tests/java/mod/_sc/ScModelObj \
qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TextFieldEnumeration.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TextFieldEnumeration.csv
deleted file mode 100644
index f01b4c52b1f7..000000000000
---
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TextFieldEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScIndexEnumeration_TextFieldEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
-"ScIndexEnumeration_TextFieldEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git
a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
deleted file mode 100644
index 632a08dc433b..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.XCell;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextContent;
-import com.sun.star.text.XTextFieldsSupplier;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
- * Test for object that represents enumeration of a collection
- * of text fields in a cell of a spreadsheet. <p>
- *
- * Object implements the following interfaces :
- * <ul>
- * <li> <code>com::sun::star::container::XEnumeration</code></li>
- * </ul> <p>
- *
- * @see com.sun.star.container.XEnumeration
- * @see ifc.container._XEnumeration
- */
-public class ScIndexEnumeration_TextFieldEnumeration extends TestCase {
- private XSpreadsheetDocument xSheetDoc = null;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws
Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() );
- log.println( "creating a Spreadsheet document" );
- xSheetDoc = SOF.createCalcDoc(null);
- }
-
- /**
- * Disposes Spreadsheet document.
- */
- @Override
- protected void cleanup( TestParameters tParam, PrintWriter log ) {
- log.println( " disposing xSheetDoc " );
- XComponent oComp = UnoRuntime.queryInterface (XComponent.class,
xSheetDoc);
- util.DesktopTools.closeDoc(oComp);
- }
-
- /**
- * Creating a TestEnvironment for the interfaces to be tested.
- * Creates an instance of the service
- * <code>com.sun.star.text.TextField.URL</code>, inserts it to the content
- * of the cell in the spreadsheet. Then the component is obtained
- * by <code>XTextFieldsSupplier</code> interface of a cell
- * and <code>XEnumerationSupplier</code> interface .<p>
- */
- @Override
- protected TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log) throws Exception {
-
- XInterface oObj = null;
- XText oText = null;
- XTextContent oContent = null;
- XInterface aField = null;
- XTextFieldsSupplier xTextFieldsSupp = null;
-
- // we want to create an instance of ScCellFieldObj.
- // to do this we must get an MultiServiceFactory.
-
- XMultiServiceFactory _oMSF =
UnoRuntime.queryInterface(XMultiServiceFactory.class, xSheetDoc);
-
- aField = (XInterface)
- _oMSF.createInstance("com.sun.star.text.TextField.URL");
- oContent = UnoRuntime.queryInterface(XTextContent.class, aField);
-
- XSpreadsheets oSheets = xSheetDoc.getSheets() ;
- XIndexAccess oIndexSheets =
UnoRuntime.queryInterface(XIndexAccess.class, oSheets);
- XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexSheets.getByIndex(0));
-
- XCell oCell = oSheet.getCellByPosition(2,3);
- oText = UnoRuntime.queryInterface(XText.class, oCell);
-
- oText.insertTextContent(
- oText.createTextCursor(), oContent, true);
-
- xTextFieldsSupp = UnoRuntime.queryInterface(XTextFieldsSupplier.class,
oCell);
-
- oObj = xTextFieldsSupp.getTextFields().createEnumeration();
-
- TestEnvironment tEnv = new TestEnvironment(oObj) ;
-
- tEnv.addObjRelation("ENUM", xTextFieldsSupp.getTextFields());
-
- return tEnv;
- }
-
-}
-
diff --git a/sc/CppunitTest_sc_indexenumeration_textfieldenumeration.mk
b/sc/CppunitTest_sc_indexenumeration_textfieldenumeration.mk
new file mode 100644
index 000000000000..b09111267b55
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_textfieldenumeration.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_indexenumeration_textfieldenumeration))
+
+$(eval $(call
gb_CppunitTest_use_external,sc_indexenumeration_textfieldenumeration,boost_headers))
+
+$(eval $(call
gb_CppunitTest_add_exception_objects,sc_indexenumeration_textfieldenumeration, \
+ sc/qa/extras/scindexenumeration_textfieldenumeration \
+))
+
+$(eval $(call
gb_CppunitTest_use_libraries,sc_indexenumeration_textfieldenumeration, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call
gb_CppunitTest_set_include,sc_indexenumeration_textfieldenumeration,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call
gb_CppunitTest_use_sdk_api,sc_indexenumeration_textfieldenumeration))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_textfieldenumeration))
+$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_textfieldenumeration))
+
+$(eval $(call
gb_CppunitTest_use_components,sc_indexenumeration_textfieldenumeration,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call
gb_CppunitTest_use_configuration,sc_indexenumeration_textfieldenumeration))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 141234c6750a..562442483970 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_indexenumeration_ddelinksenumeration \
CppunitTest_sc_indexenumeration_scenariosenumeration \
CppunitTest_sc_indexenumeration_tablerowsenumeration \
+ CppunitTest_sc_indexenumeration_textfieldenumeration \
CppunitTest_sc_importdescriptorbaseobj \
CppunitTest_sc_labelrangeobj \
CppunitTest_sc_labelrangesobj \
diff --git a/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx
b/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx
new file mode 100644
index 000000000000..86233aee872a
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_textfieldenumeration.cxx
@@ -0,0 +1,102 @@
+/* -*- 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/xenumeration.hxx>
+
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.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/XCell.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/text/XTextField.hpp>
+#include <com/sun/star/text/XTextFieldsSupplier.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest
+{
+class ScIndexEnumeration_TextFieldEnumeration : public CalcUnoApiTest, public
apitest::XEnumeration
+{
+public:
+ ScIndexEnumeration_TextFieldEnumeration();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScIndexEnumeration_TextFieldEnumeration);
+
+ // XEnumeration
+ CPPUNIT_TEST(testHasMoreElements);
+ CPPUNIT_TEST(testNextElement);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_TextFieldEnumeration::ScIndexEnumeration_TextFieldEnumeration()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScIndexEnumeration_TextFieldEnumeration::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+ uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc,
uno::UNO_QUERY_THROW);
+ uno::Reference<text::XTextField>
xTF(xMSF->createInstance("com.sun.star.text.TextField.URL"),
+ uno::UNO_QUERY_THROW);
+ uno::Reference<text::XTextContent> xTC(xTF, 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::XCell> xCell(xSheet0->getCellByPosition(2, 3),
uno::UNO_QUERY_THROW);
+ uno::Reference<text::XText> xText(xCell, uno::UNO_QUERY_THROW);
+ xText->insertTextContent(xText->createTextCursor(), xTC, true);
+ uno::Reference<text::XTextFieldsSupplier> xTFS(xCell,
uno::UNO_QUERY_THROW);
+ uno::Reference<container::XEnumerationAccess> xEA(xTFS->getTextFields(),
uno::UNO_QUERY_THROW);
+
+ return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_TextFieldEnumeration::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_TextFieldEnumeration::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TextFieldEnumeration);
+
+} // namespace sc_apitest
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sc/qa/unoapi/sc_6.sce b/sc/qa/unoapi/sc_6.sce
index 89d1c8d80c73..159ec2e1b324 100644
--- a/sc/qa/unoapi/sc_6.sce
+++ b/sc/qa/unoapi/sc_6.sce
@@ -17,7 +17,6 @@
#
-o sc.ScIndexEnumeration_TableColumnsEnumeration
-o sc.ScIndexEnumeration_TableConditionalEntryEnumeration
--o sc.ScIndexEnumeration_TextFieldEnumeration
-o sc.ScLabelRangesObj
-o sc.ScModelObj
-o sc.ScNamedRangesObj
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
