summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2018-11-15 07:53:58 +0000
committerJens Carl <j.carl43@gmx.de>2018-11-15 17:50:49 +0100
commit32a8c55c9746f27db6a825372913e639d67c3476 (patch)
treec171aec2f1bead5924025c41ef6a50e91528a70b /sc
parentac37f40464a6bce346e588b3979bf97809f18f27 (diff)
tdf#45904 Move XEnumeration Java test to C++
Move XEnumeration Java tests for ScIndexEnumeration_ScenariosEnumeration to C++; Change-Id: Ia778f644cbb2836e6c6bfc12ae389cda3420e5b2 Reviewed-on: https://gerrit.libreoffice.org/63399 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'sc')
-rw-r--r--sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk43
-rw-r--r--sc/Module_sc.mk1
-rw-r--r--sc/qa/extras/scindexenumeration_scenariosenumeration.cxx106
-rw-r--r--sc/qa/unoapi/sc_5.sce1
4 files changed, 150 insertions, 1 deletions
diff --git a/sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk b/sc/CppunitTest_sc_indexenumeration_scenariosenumeration.mk
new file mode 100644
index 000000000000..74c83007b34f
--- /dev/null
+++ b/sc/CppunitTest_sc_indexenumeration_scenariosenumeration.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_scenariosenumeration))
+
+$(eval $(call gb_CppunitTest_use_external,sc_indexenumeration_scenariosenumeration,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_indexenumeration_scenariosenumeration, \
+ sc/qa/extras/scindexenumeration_scenariosenumeration \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_indexenumeration_scenariosenumeration, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_indexenumeration_scenariosenumeration,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_indexenumeration_scenariosenumeration))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_indexenumeration_scenariosenumeration))
+$(eval $(call gb_CppunitTest_use_vcl,sc_indexenumeration_scenariosenumeration))
+
+$(eval $(call gb_CppunitTest_use_components,sc_indexenumeration_scenariosenumeration,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_indexenumeration_scenariosenumeration))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index c4d0d7d87c7e..bb405f80f0a1 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -135,6 +135,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_functionlistobj \
CppunitTest_sc_headerfootercontentobj \
CppunitTest_sc_indexenumeration_ddelinksenumeration \
+ CppunitTest_sc_indexenumeration_scenariosenumeration \
CppunitTest_sc_importdescriptorbaseobj \
CppunitTest_sc_labelrangeobj \
CppunitTest_sc_labelrangesobj \
diff --git a/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx b/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx
new file mode 100644
index 000000000000..44c4c29f2677
--- /dev/null
+++ b/sc/qa/extras/scindexenumeration_scenariosenumeration.cxx
@@ -0,0 +1,106 @@
+/* -*- 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/sheet/XCellRangeAddressable.hpp>
+#include <com/sun/star/sheet/XScenariosSupplier.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/table/XCellRange.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest
+{
+class ScIndexEnumeration_ScenariosEnumeration : public CalcUnoApiTest, public apitest::XEnumeration
+{
+public:
+ ScIndexEnumeration_ScenariosEnumeration();
+
+ virtual uno::Reference<uno::XInterface> init() override;
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+ CPPUNIT_TEST_SUITE(ScIndexEnumeration_ScenariosEnumeration);
+
+ // XEnumeration
+ CPPUNIT_TEST(testHasMoreElements);
+ CPPUNIT_TEST(testNextElement);
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<lang::XComponent> m_xComponent;
+};
+
+ScIndexEnumeration_ScenariosEnumeration::ScIndexEnumeration_ScenariosEnumeration()
+ : CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference<uno::XInterface> ScIndexEnumeration_ScenariosEnumeration::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::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), uno::UNO_QUERY_THROW);
+
+ xSheet0->getCellByPosition(5, 5)->setValue(15);
+ xSheet0->getCellByPosition(1, 4)->setValue(10);
+ xSheet0->getCellByPosition(2, 0)->setValue(-5.15);
+
+ uno::Reference<sheet::XScenariosSupplier> xScenariosSupplier(xSheet0, uno::UNO_QUERY_THROW);
+ uno::Reference<table::XCellRange> xCellRange0(xSheet0, uno::UNO_QUERY_THROW);
+ uno::Reference<table::XCellRange> xCellRange1(xCellRange0->getCellRangeByName("A1:N4"),
+ uno::UNO_QUERY_THROW);
+ uno::Reference<sheet::XCellRangeAddressable> xCRA(xCellRange1, uno::UNO_QUERY_THROW);
+
+ uno::Sequence<table::CellRangeAddress> aCRA(1);
+ aCRA[0] = xCRA->getRangeAddress();
+ xScenariosSupplier->getScenarios()->addNewByName("ScScenario", aCRA, "Range");
+ uno::Reference<container::XEnumerationAccess> xEA(xScenariosSupplier->getScenarios(),
+ uno::UNO_QUERY_THROW);
+
+ return xEA->createEnumeration();
+}
+
+void ScIndexEnumeration_ScenariosEnumeration::setUp()
+{
+ CalcUnoApiTest::setUp();
+ m_xComponent = loadFromDesktop("private:factory/scalc");
+ CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
+}
+
+void ScIndexEnumeration_ScenariosEnumeration::tearDown()
+{
+ closeDocument(m_xComponent);
+ CalcUnoApiTest::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScIndexEnumeration_ScenariosEnumeration);
+
+} // 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 4c90d8a6b19a..d86af5afd130 100644
--- a/sc/qa/unoapi/sc_5.sce
+++ b/sc/qa/unoapi/sc_5.sce
@@ -22,7 +22,6 @@
-o sc.ScIndexEnumeration_FunctionDescriptionEnumeration
-o sc.ScIndexEnumeration_LabelRangesEnumeration
-o sc.ScIndexEnumeration_NamedRangesEnumeration
--o sc.ScIndexEnumeration_ScenariosEnumeration
-o sc.ScIndexEnumeration_SheetCellRangesEnumeration
-o sc.ScIndexEnumeration_SheetLinksEnumeration
-o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration