qadevOOo/Jar_OOoRunner.mk
| 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableRowsEnumeration.csv
| 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
| 98 ----------
sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.mk
| 43 ++++
sc/Module_sc.mk
| 1
sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx
| 97 +++++++++
sc/qa/unoapi/sc_6.sce
| 1
7 files changed, 141 insertions(+), 102 deletions(-)
New commits:
commit fdb520825339a8618cd41b0d972b98155039b9e7
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Thu Nov 15 13:25:54 2018 -0800
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Fri Nov 16 07:43:44 2018 +0100
tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests for
ScIndexEnumeration_TableRowsEnumeration to C++. Also improved the
overall run time of the test by limiting the range to enumerate over for
reasons mentioned in fdo#45337.
Change-Id: Id8eb998242cacf61bb472a0c130f38482c95db1c
Reviewed-on: https://gerrit.libreoffice.org/63444
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index ef5d60294bd8..12f0796db58a 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_TableRowsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration \
qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \
qadevOOo/tests/java/mod/_sc/ScModelObj \
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableRowsEnumeration.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableRowsEnumeration.csv
deleted file mode 100644
index 67398487b882..000000000000
---
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableRowsEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScIndexEnumeration_TableRowsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
-"ScIndexEnumeration_TableRowsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git
a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
deleted file mode 100644
index 3dda6ce59d47..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
+++ /dev/null
@@ -1,98 +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.XEnumerationAccess;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.XColumnRowRange;
-import com.sun.star.table.XTableRows;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-public class ScIndexEnumeration_TableRowsEnumeration 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);
- }
-
- @Override
- protected TestEnvironment createTestEnvironment(TestParameters Param,
PrintWriter log) throws Exception {
-
- XInterface oObj = null;
-
- log.println("getting row");
- XSpreadsheet xSpreadsheet = null;
-
- XSpreadsheets xSpreadsheets = xSheetDoc.getSheets();
- XNameAccess oNames = UnoRuntime.queryInterface( XNameAccess.class,
xSpreadsheets );
- xSpreadsheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),
- oNames.getByName(oNames.getElementNames()[0]));
-
- XColumnRowRange oColumnRowRange =
UnoRuntime.queryInterface(XColumnRowRange.class, xSpreadsheet);
-
- XTableRows oRows = oColumnRowRange.getRows();
- oObj = oRows;
-
- log.println("creating a new environment for object");
-
- XEnumerationAccess ea =
UnoRuntime.queryInterface(XEnumerationAccess.class,oObj);
-
- oObj = ea.createEnumeration();
-
- log.println("ImplementationName: "+util.utils.getImplName(oObj));
- // creating test environment
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- tEnv.addObjRelation("ENUM",ea);
-
- return tEnv;
- }
-}
-
diff --git a/sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.mk
b/sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.mk
new file mode 100644
index 000000000000..cf469828aa74
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_tablerowsenumeration.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_tablerowsenumeration))
+
+$(eval $(call
gb_CppunitTest_use_external,sc_indexenumeration_tablerowsenumeration,boost_headers))
+
+$(eval $(call
gb_CppunitTest_add_exception_objects,sc_indexenumeration_tablerowsenumeration, \
+ sc/qa/extras/scindexenumeration_tablerowsenumeration \
+))
+
+$(eval $(call
gb_CppunitTest_use_libraries,sc_indexenumeration_tablerowsenumeration, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call
gb_CppunitTest_set_include,sc_indexenumeration_tablerowsenumeration,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call
gb_CppunitTest_use_sdk_api,sc_indexenumeration_tablerowsenumeration))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_tablerowsenumeration))
+$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_tablerowsenumeration))
+
+$(eval $(call
gb_CppunitTest_use_components,sc_indexenumeration_tablerowsenumeration,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call
gb_CppunitTest_use_configuration,sc_indexenumeration_tablerowsenumeration))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index bb405f80f0a1..9a3edafeb975 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -136,6 +136,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_headerfootercontentobj \
CppunitTest_sc_indexenumeration_ddelinksenumeration \
CppunitTest_sc_indexenumeration_scenariosenumeration \
+ CppunitTest_sc_indexenumeration_tablerowsenumeration \
CppunitTest_sc_importdescriptorbaseobj \
CppunitTest_sc_labelrangeobj \
CppunitTest_sc_labelrangesobj \
diff --git a/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx
b/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx
new file mode 100644
index 000000000000..17b84b8c2b8a
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx
@@ -0,0 +1,97 @@
+/* -*- 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/XNameAccess.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/XCellRange.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;
+using namespace css::uno;
+
+namespace sc_apitest
+{
+class ScIndexEnumeration_TableRowsEnumeration : public CalcUnoApiTest, public
apitest::XEnumeration
+{
+public:
+ ScIndexEnumeration_TableRowsEnumeration();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScIndexEnumeration_TableRowsEnumeration);
+
+ // XEnumeration
+ CPPUNIT_TEST(testHasMoreElements);
+ CPPUNIT_TEST(testNextElement);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_TableRowsEnumeration::ScIndexEnumeration_TableRowsEnumeration()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScIndexEnumeration_TableRowsEnumeration::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+ uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(),
uno::UNO_QUERY_THROW);
+ uno::Reference<container::XNameAccess> xNA(xSheets, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XSpreadsheet>
xSheet0(xNA->getByName(xNA->getElementNames()[0]),
+ uno::UNO_QUERY_THROW);
+
+ // limit the range the XEnumeration has to walk over (see fdo#45337).
+ uno::Reference<table::XCellRange> xCR(xSheet0->getCellRangeByName("A1:A4"),
+ uno::UNO_QUERY_THROW);
+
+ uno::Reference<table::XColumnRowRange> xColRowRange(xCR,
uno::UNO_QUERY_THROW);
+ uno::Reference<table::XTableRows> xTableRows(xColRowRange->getRows(),
uno::UNO_QUERY_THROW);
+ uno::Reference<container::XEnumerationAccess> xEA(xTableRows,
uno::UNO_QUERY_THROW);
+
+ return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_TableRowsEnumeration::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_TableRowsEnumeration::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_TableRowsEnumeration);
+
+} // 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 77864244753c..89d1c8d80c73 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
-# fdo#45337 -o sc.ScIndexEnumeration_TableRowsEnumeration
-o sc.ScIndexEnumeration_TextFieldEnumeration
-o sc.ScLabelRangesObj
-o sc.ScModelObj
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
