tdf#45904 Move _SpreadsheetViewSettings Java tests to C++

Change-Id: I68dcabd15b4b318a833a893b4de96c64ffd2a164
Reviewed-on: https://gerrit.libreoffice.org/47625Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jens Carl <j.carl43@gmx.de>

include/test/sheet/spreadsheetviewsettings.hxx

+/* -*- 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_SHEET_SPREADSHEETVIEWSETTINGS_HXX
+#define INCLUDED_TEST_SHEET_SPREADSHEETVIEWSETTINGS_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 SpreadsheetViewSettings
+{
+public:
+    virtual css::uno::Reference<css::uno::XInterface> init() = 0;
+
+    void testSpreadsheetViewSettingsProperties();
+
+protected:
+    ~SpreadsheetViewSettings() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_SPREADSHEETVIEWSETTINGS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

qadevOOo/Jar_OOoRunner.mk

@@ -575,7 +575,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/sheet/_Spreadsheet \
     qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \
     qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings \
-    qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings \
     qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
     qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
     qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \

qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv

@@ -15,26 +15,6 @@
 "ScTabViewObj";"com::sun::star::sheet::XCellRangeReferrer";"getReferredCells()"
 "ScTabViewObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScTabViewObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowFormulas"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowZeroValues"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"IsValueHighlightingEnabled"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowNotes"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HasVerticalScrollBar"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HasHorizontalScrollBar"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HasSheetTabs"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"IsOutlineSymbolsSet"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HasColumnRowHeaders"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowGrid"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"GridColor"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowHelpLines"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowAnchor"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowPageBreaks"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowObjects"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowCharts"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowDrawing"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HideSpellMarks"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ZoomType"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ZoomValue"
 "ScTabViewObj";"com::sun::star::sheet::XActivationBroadcaster#optional";"addActivationEventListener()"
 "ScTabViewObj";"com::sun::star::sheet::XActivationBroadcaster#optional";"removeActivationEventListener()"
 "ScTabViewObj";"com::sun::star::sheet::XRangeSelection";"startRangeSelection()"

qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java

-/*
- * 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 ifc.sheet;
-
-import com.sun.star.view.DocumentZoomType;
-
-import lib.MultiPropertyTest;
-
-
-/**
-* Testing <code>com.sun.star.sheet.SpreadsheetViewSettings</code>
-* service properties :
-* <ul>
-*  <li><code> ShowFormulas</code></li>
-*  <li><code> ShowZeroValues</code></li>
-*  <li><code> IsValueHighlightingEnabled</code></li>
-*  <li><code> ShowNotes</code></li>
-*  <li><code> HasVerticalScrollBar</code></li>
-*  <li><code> HasHorizontalScrollBar</code></li>
-*  <li><code> HasSheetTabs</code></li>
-*  <li><code> IsOutlineSymbolsSet</code></li>
-*  <li><code> HasColumnRowHeaders</code></li>
-*  <li><code> ShowGrid</code></li>
-*  <li><code> GridColor</code></li>
-*  <li><code> ShowHelpLines</code></li>
-*  <li><code> ShowAnchor</code></li>
-*  <li><code> ShowPageBreaks</code></li>
-*  <li><code> ShowObjects</code></li>
-*  <li><code> ShowCharts</code></li>
-*  <li><code> ShowDrawing</code></li>
-*  <li><code> HideSpellMarks</code></li>
-*  <li><code> ZoomType</code></li>
-*  <li><code> ZoomValue</code></li>
-* </ul> <p>
-* Properties testing is automated by <code>lib.MultiPropertyTest</code>.
-* @see com.sun.star.sheet.SpreadsheetViewSettings
-*/
-public class _SpreadsheetViewSettings extends MultiPropertyTest {
-    public void _ZoomType() {
-        testProperty("ZoomType", Short.valueOf(DocumentZoomType.PAGE_WIDTH),
-                     Short.valueOf(DocumentZoomType.BY_VALUE));
-    }
-
-    /**
-    * Forces environment recreation.
-    */
-    @Override
-    protected void after() {
-        disposeEnvironment();
-    }
-} // finish class _SpreadsheetViewSettings

sc/qa/extras/sctabviewobj.cxx

@@ -8,6 +8,7 @@
  */
 
 #include <test/calc_unoapi_test.hxx>
+#include <test/sheet/spreadsheetviewsettings.hxx>
 #include <test/sheet/xspreadsheetview.hxx>
 #include <test/sheet/xviewfreezable.hxx>
 #include <test/sheet/xviewsplitable.hxx>
@@ -26,11 +27,13 @@ using namespace css::uno;
 
 namespace sc_apitest {
 
-#define NUMBER_OF_TESTS 3
+#define NUMBER_OF_TESTS 4
 
-class ScTabViewObj : public CalcUnoApiTest, public apitest::XSpreadsheetView,
-                                            public apitest::XViewFreezable,
-                                            public apitest::XViewSplitable
+class ScTabViewObj : public CalcUnoApiTest,
+                     public apitest::SpreadsheetViewSettings,
+                     public apitest::XSpreadsheetView,
+                     public apitest::XViewFreezable,
+                     public apitest::XViewSplitable
 {
 public:
     ScTabViewObj();
@@ -41,6 +44,9 @@ public:
 
     CPPUNIT_TEST_SUITE(ScTabViewObj);
 
+    // SpreadsheetViewSettings
+    CPPUNIT_TEST(testSpreadsheetViewSettingsProperties);
+
     // XSpreadsheetView
     CPPUNIT_TEST(testGetSetActiveSheet);
 

test/Library_subsequenttest.mk

@@ -50,6 +50,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
 	test/source/sheet/datapilotitem \
 	test/source/sheet/documentsettings \
 	test/source/sheet/scenario \
+	test/source/sheet/spreadsheetviewsettings \
 	test/source/sheet/subtotaldescriptor \
 	test/source/sheet/tableautoformat \
 	test/source/sheet/tablevalidation \