summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRahul Gurung <gurungrahul2@gmail.com>2018-10-13 00:18:58 +0530
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2018-11-02 06:29:58 +0100
commit9329d18235d21a00dbc724ba3251e95fbb675588 (patch)
treebfbc019405aa3957b609ad05709abd7d448f049e
parent68af083f9a8e3904aa3c341da5c598212da68f6f (diff)
tdf#45904 Move _XEnumerationAccess Java Tests to C++
Change-Id: Id0aa9f3587fc6427bdbd938293eb3cc564c52bb1 Reviewed-on: https://gerrit.libreoffice.org/61731 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--include/test/container/xenumerationaccess.hxx34
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangesObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv2
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv1
-rw-r--r--qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv1
-rw-r--r--sc/qa/extras/scannotationsobj.cxx7
-rw-r--r--sc/qa/extras/scarealinksobj.cxx7
-rw-r--r--sc/qa/extras/scautoformatobj.cxx9
-rw-r--r--sc/qa/extras/sccellobj.cxx5
-rw-r--r--sc/qa/extras/sccellrangesobj.cxx5
-rw-r--r--sc/qa/extras/scdatabaserangesobj.cxx8
-rw-r--r--sc/qa/extras/scdatapilottablesobj.cxx8
-rw-r--r--sc/qa/extras/scfunctionlistobj.cxx8
-rw-r--r--sc/qa/extras/sclabelrangesobj.cxx8
-rw-r--r--sc/qa/extras/scscenariosobj.cxx8
-rw-r--r--sc/qa/extras/scsubtotaldescriptorbaseobj.cxx10
-rw-r--r--sc/qa/extras/sctableconditionalformatobj.cxx8
-rw-r--r--sc/qa/extras/sctablesheetsobj.cxx9
-rw-r--r--sc/qa/extras/sctabviewobj.cxx5
-rw-r--r--test/Library_subsequenttest.mk1
-rw-r--r--test/source/container/xenumerationaccess.cxx32
31 files changed, 159 insertions, 28 deletions
diff --git a/include/test/container/xenumerationaccess.hxx b/include/test/container/xenumerationaccess.hxx
new file mode 100644
index 000000000000..272172c8d519
--- /dev/null
+++ b/include/test/container/xenumerationaccess.hxx
@@ -0,0 +1,34 @@
+/* -*- 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/.
+*/
+
+#ifndef INCLUDED_TEST_CONTAINER_XENUMERATIONACCESS_HXX
+#define INCLUDED_TEST_CONTAINER_XENUMERATIONACCESS_HXX
+
+#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <test/testdllapi.hxx>
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XEnumerationAccess
+{
+public:
+ virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+
+ void testCreateEnumeration();
+
+protected:
+ ~XEnumerationAccess() {}
+};
+}
+
+#endif // INCLUDED_TEST_CONTAINER_XENUMERATIONACCESS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
index 09c3b94d5afd..1a785cf0f365 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
@@ -2,4 +2,3 @@
"ScAnnotationsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScAnnotationsObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScAnnotationsObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScAnnotationsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
index f88bd91a2c70..41dc5a564263 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv
@@ -2,4 +2,3 @@
"ScAreaLinksObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScAreaLinksObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScAreaLinksObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScAreaLinksObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
index 5c2ef08269c9..c4a036d9c3f2 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv
@@ -11,4 +11,3 @@
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScAutoFormatObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScAutoFormatObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
index e54b4fc80ff0..3be24423a38d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
@@ -192,7 +192,6 @@
"ScCellObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScCellObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScCellObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScCellObj";"com::sun::star::container::XEnumerationAccess#optional";"createEnumeration()"
"ScCellObj";"com::sun::star::text::XText";"insertTextContent()"
"ScCellObj";"com::sun::star::text::XText";"removeTextContent()"
"ScCellObj";"com::sun::star::util::XModifyBroadcaster#optional";"addModifyListener()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
index 8ccb63dc174b..a5e541df896f 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
@@ -186,4 +186,3 @@
"ScCellRangesObj";"com::sun::star::chart::XChartDataArray";"setRowDescriptions()"
"ScCellRangesObj";"com::sun::star::chart::XChartDataArray";"getColumnDescriptions()"
"ScCellRangesObj";"com::sun::star::chart::XChartDataArray";"setColumnDescriptions()"
-"ScCellRangesObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
index fe555ba2cbc1..4de45992a904 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv
@@ -5,4 +5,3 @@
"ScDataPilotTablesObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScDataPilotTablesObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScDataPilotTablesObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScDataPilotTablesObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangesObj.csv
index b96b85557d70..0b86a569afeb 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangesObj.csv
@@ -5,4 +5,3 @@
"ScDatabaseRangesObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScDatabaseRangesObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScDatabaseRangesObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScDatabaseRangesObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv
index 5253ef4dbe6f..6eacd178c0e2 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv
@@ -5,4 +5,3 @@
"ScFunctionListObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScFunctionListObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScFunctionListObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScFunctionListObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv
index c664a49e524c..62e3ab113118 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv
@@ -2,4 +2,3 @@
"ScLabelRangesObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScLabelRangesObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScLabelRangesObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScLabelRangesObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv
index 6e1065e5bba4..076436a5c91d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv
@@ -5,4 +5,3 @@
"ScScenariosObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScScenariosObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScScenariosObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScScenariosObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
index 9aa6d5addfeb..2ba64e29988c 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
@@ -9,4 +9,3 @@
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
-"ScSubTotalDescriptorBase";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
index e3774a311576..eee960dcfa3e 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
@@ -37,7 +37,6 @@
"ScTabViewObj";"com::sun::star::view::XFormLayerAccess#optional";"getFromController()"
"ScTabViewObj";"com::sun::star::view::XFormLayerAccess#optional";"isFormDesignMode()"
"ScTabViewObj";"com::sun::star::view::XFormLayerAccess#optional";"setFormDesignMode()"
-"ScTabViewObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
"ScTabViewObj";"com::sun::star::frame::XController";"attachFrame()"
"ScTabViewObj";"com::sun::star::frame::XController";"attachModel()"
"ScTabViewObj";"com::sun::star::frame::XController";"suspend()"
@@ -49,4 +48,3 @@
"ScTabViewObj";"com::sun::star::awt::XUserInputInterception#optional";"removeKeyHandler()"
"ScTabViewObj";"com::sun::star::awt::XUserInputInterception#optional";"addMouseClickHandler()"
"ScTabViewObj";"com::sun::star::awt::XUserInputInterception#optional";"removeMouseClickHandler()"
-
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv
index e8087460e929..acfc8dac9c8e 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv
@@ -5,4 +5,3 @@
"ScTableConditionalFormat";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScTableConditionalFormat";"com::sun::star::container::XElementAccess";"getElementType()"
"ScTableConditionalFormat";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScTableConditionalFormat";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
index 514566881a29..8eca36532a14 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv
@@ -8,4 +8,3 @@
"ScTableSheetsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScTableSheetsObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScTableSheetsObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScTableSheetsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx
index 31f94c3e3196..cf53b8ae3d3d 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/xsheetannotations.hxx>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -20,7 +21,8 @@ using namespace css::uno;
namespace sc_apitest {
-class ScAnnontationsObj : public CalcUnoApiTest, public apitest::XSheetAnnotations
+class ScAnnontationsObj : public CalcUnoApiTest, public apitest::XEnumerationAccess,
+ public apitest::XSheetAnnotations
{
public:
ScAnnontationsObj();
@@ -33,6 +35,9 @@ public:
CPPUNIT_TEST_SUITE(ScAnnontationsObj);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XSheetAnnotations
CPPUNIT_TEST(testInsertNew);
CPPUNIT_TEST(testRemoveByIndex);
diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx
index 352efd65d20b..73a0f2e303dd 100644
--- a/sc/qa/extras/scarealinksobj.cxx
+++ b/sc/qa/extras/scarealinksobj.cxx
@@ -9,6 +9,7 @@
#include <test/calc_unoapi_test.hxx>
#include <test/sheet/xarealinks.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XAreaLinks.hpp>
@@ -22,7 +23,8 @@ using namespace css::uno;
namespace sc_apitest {
-class ScAreaLinksObj : public CalcUnoApiTest, public apitest::XAreaLinks
+class ScAreaLinksObj : public CalcUnoApiTest, public apitest::XAreaLinks,
+ public apitest::XEnumerationAccess
{
public:
ScAreaLinksObj();
@@ -37,6 +39,9 @@ public:
CPPUNIT_TEST(testInsertAtPosition);
CPPUNIT_TEST(testRemoveByIndex);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 851f6dce34ac..518b967335b1 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/tableautoformat.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -25,7 +26,10 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScAutoFormatObj : public CalcUnoApiTest, public apitest::TableAutoFormat
+class ScAutoFormatObj : public CalcUnoApiTest,
+ public apitest::XEnumerationAccess,
+ public apitest::TableAutoFormat
+
{
public:
ScAutoFormatObj();
@@ -36,6 +40,9 @@ public:
CPPUNIT_TEST_SUITE(ScAutoFormatObj);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// TableAutoFormat
CPPUNIT_TEST(testTableAutoFormatProperties);
diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx
index 5ade0aef45f3..cb1c5a1421fd 100644
--- a/sc/qa/extras/sccellobj.cxx
+++ b/sc/qa/extras/sccellobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/sheetcell.hxx>
#include <test/table/xcell.hxx>
#include <test/sheet/xcelladdressable.hxx>
@@ -35,6 +36,7 @@ class ScCellObj : public CalcUnoApiTest, public apitest::SheetCell,
public apitest::XCell,
public apitest::XCellAddressable,
public apitest::XColumnRowRange,
+ public apitest::XEnumerationAccess,
public apitest::XFormulaQuery,
public apitest::XIndent,
public apitest::XSheetAnnotationAnchor
@@ -65,6 +67,9 @@ public:
CPPUNIT_TEST(testGetColumns);
CPPUNIT_TEST(testGetRows);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XFormulaQuery
CPPUNIT_TEST(testQueryDependents);
CPPUNIT_TEST(testQueryPrecedents);
diff --git a/sc/qa/extras/sccellrangesobj.cxx b/sc/qa/extras/sccellrangesobj.cxx
index 01785b538cb9..8d81f5b85071 100644
--- a/sc/qa/extras/sccellrangesobj.cxx
+++ b/sc/qa/extras/sccellrangesobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/sheetcellranges.hxx>
#include <test/sheet/xformulaquery.hxx>
#include <test/sheet/xsheetcellrangecontainer.hxx>
@@ -32,6 +33,7 @@ namespace sc_apitest {
class ScCellRangesObj : public CalcUnoApiTest,
public apitest::SheetCellRanges,
+ public apitest::XEnumerationAccess,
public apitest::XFormulaQuery,
public apitest::XIndent,
public apitest::XSheetCellRangeContainer,
@@ -52,6 +54,9 @@ public:
// SheetCellRanges
CPPUNIT_TEST(testSheetCellRangesProperties);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XFormulaQuery
CPPUNIT_TEST(testQueryDependents);
CPPUNIT_TEST(testQueryPrecedents);
diff --git a/sc/qa/extras/scdatabaserangesobj.cxx b/sc/qa/extras/scdatabaserangesobj.cxx
index a2f2c42308cf..f37a262b2377 100644
--- a/sc/qa/extras/scdatabaserangesobj.cxx
+++ b/sc/qa/extras/scdatabaserangesobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/xdatabaseranges.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -25,7 +26,9 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScDatabaseRangesObj : public CalcUnoApiTest, public apitest::XDatabaseRanges
+class ScDatabaseRangesObj : public CalcUnoApiTest,
+ public apitest::XDatabaseRanges,
+ public apitest::XEnumerationAccess
{
public:
ScDatabaseRangesObj();
@@ -39,6 +42,9 @@ public:
// XDatabaseRanges
CPPUNIT_TEST(testAddRemoveDbRanges);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/sc/qa/extras/scdatapilottablesobj.cxx b/sc/qa/extras/scdatapilottablesobj.cxx
index 7a86605852e7..eb3eaf884563 100644
--- a/sc/qa/extras/scdatapilottablesobj.cxx
+++ b/sc/qa/extras/scdatapilottablesobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/xdatapilottables.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -30,7 +31,9 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScDataPilotTablesObj : public CalcUnoApiTest, public apitest::XDataPilotTables
+class ScDataPilotTablesObj : public CalcUnoApiTest,
+ public apitest::XDataPilotTables,
+ public apitest::XEnumerationAccess
{
public:
ScDataPilotTablesObj();
@@ -45,6 +48,9 @@ public:
// XDataPilotTables
CPPUNIT_TEST(testXDataPilotTables);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/sc/qa/extras/scfunctionlistobj.cxx b/sc/qa/extras/scfunctionlistobj.cxx
index 59e4baf2d4c0..ae68e5404b58 100644
--- a/sc/qa/extras/scfunctionlistobj.cxx
+++ b/sc/qa/extras/scfunctionlistobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/xfunctiondescriptions.hxx>
#include <com/sun/star/lang/XComponent.hpp>
@@ -22,7 +23,9 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScFunctionListObj : public CalcUnoApiTest, public apitest::XFunctionDescriptions
+class ScFunctionListObj : public CalcUnoApiTest,
+ public apitest::XEnumerationAccess,
+ public apitest::XFunctionDescriptions
{
public:
ScFunctionListObj();
@@ -33,6 +36,9 @@ public:
CPPUNIT_TEST_SUITE(ScFunctionListObj);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XFunctionDescriptions
CPPUNIT_TEST(testGetById);
diff --git a/sc/qa/extras/sclabelrangesobj.cxx b/sc/qa/extras/sclabelrangesobj.cxx
index 5a654b5ce727..44e05c8ef7a0 100644
--- a/sc/qa/extras/sclabelrangesobj.cxx
+++ b/sc/qa/extras/sclabelrangesobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/xlabelranges.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -25,7 +26,9 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScLabelRangesObj : public CalcUnoApiTest, public apitest::XLabelRanges
+class ScLabelRangesObj : public CalcUnoApiTest,
+ public apitest::XEnumerationAccess,
+ public apitest::XLabelRanges
{
public:
ScLabelRangesObj();
@@ -36,6 +39,9 @@ public:
CPPUNIT_TEST_SUITE(ScLabelRangesObj);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XLabelRanges
CPPUNIT_TEST(testAddNew);
CPPUNIT_TEST(testRemoveByIndex);
diff --git a/sc/qa/extras/scscenariosobj.cxx b/sc/qa/extras/scscenariosobj.cxx
index ebd8ce82155d..baa263998ecc 100644
--- a/sc/qa/extras/scscenariosobj.cxx
+++ b/sc/qa/extras/scscenariosobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/xscenarios.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -32,7 +33,9 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScScenariosObj : public CalcUnoApiTest, public apitest::XScenarios
+class ScScenariosObj : public CalcUnoApiTest,
+ public apitest::XEnumerationAccess,
+ public apitest::XScenarios
{
public:
ScScenariosObj();
@@ -43,6 +46,9 @@ public:
CPPUNIT_TEST_SUITE(ScScenariosObj);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XScenarios
CPPUNIT_TEST(testAddNewByName);
CPPUNIT_TEST(testRemoveByName);
diff --git a/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx b/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
index 62ce0c69564a..25236174837a 100644
--- a/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
+++ b/sc/qa/extras/scsubtotaldescriptorbaseobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/subtotaldescriptor.hxx>
#include <test/sheet/xsubtotaldescriptor.hxx>
@@ -31,9 +32,9 @@ using namespace com::sun::star;
namespace sc_apitest {
-class ScSubTotalDescriptorBaseObj : public CalcUnoApiTest,
- public apitest::SubTotalDescriptor,
- public apitest::XSubTotalDescriptor
+class ScSubTotalDescriptorBaseObj : public CalcUnoApiTest,public apitest::XEnumerationAccess,
+ public apitest::SubTotalDescriptor,
+ public apitest::XSubTotalDescriptor
{
public:
ScSubTotalDescriptorBaseObj();
@@ -44,6 +45,9 @@ public:
CPPUNIT_TEST_SUITE(ScSubTotalDescriptorBaseObj);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// SubTotalDescriptor
CPPUNIT_TEST(testSubTotalDescriptorProperties);
diff --git a/sc/qa/extras/sctableconditionalformatobj.cxx b/sc/qa/extras/sctableconditionalformatobj.cxx
index f245189c9ccd..adb0ae023820 100644
--- a/sc/qa/extras/sctableconditionalformatobj.cxx
+++ b/sc/qa/extras/sctableconditionalformatobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/xsheetconditionalentries.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -34,7 +35,9 @@ using namespace com::sun::star;
namespace sc_apitest
{
-class ScTableConditionalFormatObj : public CalcUnoApiTest, public apitest::XSheetConditionalEntries
+class ScTableConditionalFormatObj : public CalcUnoApiTest,
+ public apitest::XEnumerationAccess,
+ public apitest::XSheetConditionalEntries
{
public:
ScTableConditionalFormatObj();
@@ -46,6 +49,9 @@ public:
CPPUNIT_TEST_SUITE(ScTableConditionalFormatObj);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XSheetConditionalEntries
CPPUNIT_TEST(testAddNew);
CPPUNIT_TEST(testClear);
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index a1152fa5cf08..f6539a21a5fd 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/container/xnamecontainer.hxx>
#include <test/sheet/xspreadsheets.hxx>
#include <test/sheet/xspreadsheets2.hxx>
@@ -20,7 +21,10 @@ using namespace css::uno;
namespace sc_apitest {
-class ScTableSheetsObj : public CalcUnoApiTest, public ::apitest::XSpreadsheets, public ::apitest::XSpreadsheets2, public apitest::XNameContainer
+class ScTableSheetsObj : public CalcUnoApiTest, public apitest::XEnumerationAccess,
+ public ::apitest::XSpreadsheets,
+ public ::apitest::XSpreadsheets2,
+ public apitest::XNameContainer
{
public:
ScTableSheetsObj();
@@ -30,6 +34,9 @@ public:
CPPUNIT_TEST_SUITE(ScTableSheetsObj);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XSpreadsheets
CPPUNIT_TEST(testInsertNewByName);
CPPUNIT_TEST(testInsertNewByNameBadName);
diff --git a/sc/qa/extras/sctabviewobj.cxx b/sc/qa/extras/sctabviewobj.cxx
index f4b54be64c7d..f92c2dd9fa57 100644
--- a/sc/qa/extras/sctabviewobj.cxx
+++ b/sc/qa/extras/sctabviewobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/container/xenumerationaccess.hxx>
#include <test/sheet/spreadsheetviewsettings.hxx>
#include <test/sheet/xactivationbroadcaster.hxx>
#include <test/sheet/xcellrangereferrer.hxx>
@@ -33,6 +34,7 @@ class ScTabViewObj : public CalcUnoApiTest,
public apitest::SpreadsheetViewSettings,
public apitest::XActivationBroadcaster,
public apitest::XCellRangeReferrer,
+ public apitest::XEnumerationAccess,
public apitest::XSpreadsheetView,
public apitest::XViewFreezable,
public apitest::XViewSplitable
@@ -58,6 +60,9 @@ public:
//Disabled till it's clear why it fails on some machines.
//CPPUNIT_TEST(testGetReferredCells);
+ // XEnumerationAccess
+ CPPUNIT_TEST(testCreateEnumeration);
+
// XSpreadsheetView
CPPUNIT_TEST(testGetSetActiveSheet);
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 694fc9c5041d..cf30238f7d71 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/beans/xpropertyset \
test/source/container/xchild \
test/source/container/xelementaccess \
+ test/source/container/xenumerationaccess \
test/source/container/xindexaccess \
test/source/container/xnamecontainer \
test/source/container/xnamed \
diff --git a/test/source/container/xenumerationaccess.cxx b/test/source/container/xenumerationaccess.cxx
new file mode 100644
index 000000000000..2de4999f3525
--- /dev/null
+++ b/test/source/container/xenumerationaccess.cxx
@@ -0,0 +1,32 @@
+/* -*- 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/container/xenumerationaccess.hxx>
+
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <cppunit/extensions/HelperMacros.h>
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+
+namespace apitest
+{
+void XEnumerationAccess::testCreateEnumeration()
+{
+ uno::Reference<container::XEnumerationAccess> xEnumerationAccess(init(), UNO_QUERY_THROW);
+
+ CPPUNIT_ASSERT_MESSAGE("Successfully able to Create Enumeration",
+ xEnumerationAccess->createEnumeration());
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */