[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk sc/Module_sc.mk sc/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Nov 20 08:00:00 UTC 2018
framework/qa/complex/api_internal/api.lst | 1
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SpreadsheetViewPanesEnumeration.csv | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java | 88 ---------
sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk | 43 ++++
sc/Module_sc.mk | 1
sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx | 91 ++++++++++
sc/qa/unoapi/sc_5.sce | 1
8 files changed, 135 insertions(+), 93 deletions(-)
New commits:
commit 0c627e494052f8717856712358763eb670b5a5fb
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Tue Nov 20 06:56:51 2018 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Tue Nov 20 08:59:37 2018 +0100
tdf#45904 Move XEnumeration Java tests to C++
Move XEnumeration Java tests to C++
for ScIndexEnumeration_SpreadsheetViewPanesEnumeration.
Change-Id: I03c05cd894bf84816618ac28deb01ecb2fd8779e
Reviewed-on: https://gerrit.libreoffice.org/63622
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index fdf7f3030838..d4a6db38b1eb 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -94,7 +94,6 @@ job96=sc.ScFilterDescriptorBase
job97=sc.ScFunctionListObj
job98=sc.ScHeaderFieldObj
job99=sc.ScHeaderFieldsObj
-job114=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
job115=sc.ScIndexEnumeration_SubTotalFieldsEnumeration
job117=sc.ScIndexEnumeration_TableChartsEnumeration
job122=sc.ScLabelRangesObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4cf8ba0bfdab..b443935bd60e 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -993,7 +993,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \
- qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration \
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration \
qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SpreadsheetViewPanesEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SpreadsheetViewPanesEnumeration.csv
deleted file mode 100644
index 03d0ea5a3fb6..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SpreadsheetViewPanesEnumeration.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScIndexEnumeration_SpreadsheetViewPanesEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()"
-"ScIndexEnumeration_SpreadsheetViewPanesEnumeration";"com::sun::star::container::XEnumeration";"nextElement()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
deleted file mode 100644
index 11050dd12994..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
+++ /dev/null
@@ -1,88 +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.XIndexAccess;
-import com.sun.star.frame.XController;
-import com.sun.star.frame.XModel;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSpreadsheetDocument;
-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_SpreadsheetViewPanesEnumeration extends TestCase {
- private XSpreadsheetDocument xSpreadsheetDoc;
- private static SOfficeFactory SOF;
- private static XInterface oObj;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- public void initialize( TestParameters Param, PrintWriter log ) throws Exception {
- // get a soffice factory object
- SOF = SOfficeFactory.getFactory( Param.getMSF());
-
- log.println("creating a spreadsheetdocument");
- xSpreadsheetDoc = SOF.createCalcDoc(null);
- }
-
- /**
- * Disposes Spreadsheet document.
- */
- @Override
- protected void cleanup( TestParameters tParam, PrintWriter log ) {
- log.println("disposing xSpreadsheetDocument");
- XComponent oComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc);
- util.DesktopTools.closeDoc(oComp);
- }
-
- @Override
- protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
-
- XModel xm = UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc);
- XController xc = xm.getCurrentController();
- XIndexAccess xIA = UnoRuntime.queryInterface(XIndexAccess.class, xc);
- oObj = (XInterface) AnyConverter.toObject(
- new Type(XInterface.class),xIA.getByIndex(0));
-
- XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,xIA);
-
- 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_spreadsheetviewpanesenumeration.mk b/sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk
new file mode 100644
index 000000000000..aaaeef91a6cf
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.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_spreadsheetviewpanesenumeration))
+
+$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_spreadsheetviewpanesenumeration,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_spreadsheetviewpanesenumeration, \
+ sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_spreadsheetviewpanesenumeration, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_spreadsheetviewpanesenumeration,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_spreadsheetviewpanesenumeration))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_spreadsheetviewpanesenumeration))
+$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_spreadsheetviewpanesenumeration))
+
+$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_spreadsheetviewpanesenumeration,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_spreadsheetviewpanesenumeration))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 30070f392d4d..6a49c1a46390 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_indexenumeration_sheetcellrangesenumeration \
CppunitTest_sc_indexenumeration_sheetlinksenumeration \
CppunitTest_sc_indexenumeration_spreadsheetsenumeration \
+ CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration \
CppunitTest_sc_indexenumeration_tableautoformatenumeration \
CppunitTest_sc_indexenumeration_tableconditionalentryenumeration \
CppunitTest_sc_indexenumeration_tablecolumnsenumeration \
diff --git a/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx b/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx
new file mode 100644
index 000000000000..d0dc427634c1
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx
@@ -0,0 +1,91 @@
+/* -*- 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/frame/XController.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.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_SpreadsheetViewPanesEnumeration : public CalcUnoApiTest,
+ public apitest::XEnumeration
+{
+public:
+ ScIndexEnumeration_SpreadsheetViewPanesEnumeration();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScIndexEnumeration_SpreadsheetViewPanesEnumeration);
+
+ // XEnumeration
+ CPPUNIT_TEST(testHasMoreElements);
+ CPPUNIT_TEST(testNextElement);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_SpreadsheetViewPanesEnumeration::
+ ScIndexEnumeration_SpreadsheetViewPanesEnumeration()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScIndexEnumeration_SpreadsheetViewPanesEnumeration::init()
+{
+ uno::Reference<sheet::XSpreadsheetDocument> xDoc(m_xComponent, uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+ uno::Reference<frame::XModel> xModel(xDoc, uno::UNO_QUERY_THROW);
+ uno::Reference<frame::XController> xController(xModel->getCurrentController(),
+ uno::UNO_QUERY_THROW);
+ uno::Reference<container::XIndexAccess> xIA(xController, uno::UNO_QUERY_THROW);
+ xIA->getByIndex(0);
+
+ uno::Reference<container::XEnumerationAccess> xEA(xIA, uno::UNO_QUERY_THROW);
+
+ return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_SpreadsheetViewPanesEnumeration::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_SpreadsheetViewPanesEnumeration::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_SpreadsheetViewPanesEnumeration);
+
+} // 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_5.sce b/sc/qa/unoapi/sc_5.sce
index 34e80062ae34..9f607d1d6be4 100644
--- a/sc/qa/unoapi/sc_5.sce
+++ b/sc/qa/unoapi/sc_5.sce
@@ -16,6 +16,5 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-o sc.ScIndexEnumeration_DataPilotItemsEnumeration
--o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
-o sc.ScIndexEnumeration_SubTotalFieldsEnumeration
-o sc.ScIndexEnumeration_TableChartsEnumeration
More information about the Libreoffice-commits
mailing list