From b910203239f29d886c698377fa40185998adbae3 Mon Sep 17 00:00:00 2001 From: Jens Carl Date: Thu, 22 Mar 2018 06:13:33 +0000 Subject: tdf#45904 Move _SpreadsheetDocumentSettings Java test to C++ Change-Id: Ic6bde95d0d4255e082a60e41a117365422b22aa8 Reviewed-on: https://gerrit.libreoffice.org/51724 Tested-by: Jenkins Reviewed-by: Jens Carl --- qadevOOo/Jar_OOoRunner.mk | 1 - .../sc/com.sun.star.comp.office.ScModelObj.csv | 18 --- ...n.star.comp.office.ScSpreadsheetSettingsObj.csv | 18 --- .../ifc/sheet/_SpreadsheetDocumentSettings.java | 141 --------------------- 4 files changed, 178 deletions(-) delete mode 100644 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java (limited to 'qadevOOo') diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 26231e68ee5a..a4c1b2d0105f 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -566,7 +566,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_FunctionDescription \ qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor \ qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \ - qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings \ qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \ qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \ qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv index 69b54496331b..a1f591442897 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv @@ -52,24 +52,6 @@ "ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"SheetLinks" "ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"AreaLinks" "ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"DDELinks" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"IsIterationEnabled" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"IterationCount" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"IterationEpsilon" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"StandardDecimals" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"NullDate" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"DefaultTabStop" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"IgnoreCase" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"CalcAsShown" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"MatchWholeCell" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"SpellOnline" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"LookUpLabels" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"RegularExpressions" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"ForbiddenCharacters#optional" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"HasDrawPages#optional" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"CharLocale#optional" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"CharLocaleAsian#optional" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"CharLocaleComplex#optional" -"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"Wildcards#optional" "ScModelObj";"com::sun::star::document::OfficeDocument";"AutomaticControlFocus#optional" "ScModelObj";"com::sun::star::document::OfficeDocument";"ApplyFormDesignMode#optional" "ScModelObj";"com::sun::star::document::OfficeDocument";"RuntimeUID#optional" diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv index 2d15f48c3a7b..7a473c2de4b9 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv @@ -5,21 +5,3 @@ "ScSpreadsheetSettingsObj";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()" "ScSpreadsheetSettingsObj";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()" "ScSpreadsheetSettingsObj";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"IsIterationEnabled" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"IterationCount" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"IterationEpsilon" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"StandardDecimals" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"NullDate" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"DefaultTabStop" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"IgnoreCase" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"CalcAsShown" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"MatchWholeCell" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"SpellOnline" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"LookUpLabels" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"RegularExpressions" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"ForbiddenCharacters#optional" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"HasDrawPages#optional" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"CharLocale#optional" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"CharLocaleAsian#optional" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"CharLocaleComplex#optional" -"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"Wildcards#optional" diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java deleted file mode 100644 index 8a00babb9c85..000000000000 --- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java +++ /dev/null @@ -1,141 +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 ifc.sheet; - -import lib.MultiPropertyTest; - -import com.sun.star.i18n.ForbiddenCharacters; -import com.sun.star.i18n.XForbiddenCharacters; -import com.sun.star.lang.Locale; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.Date; - - -/** -* Testing com.sun.star.sheet.SpreadsheetDocumentSettings -* service properties : -*
    -*
  • IsIterationEnabled
    • -*
  • IterationCount
    • -*
  • IterationEpsilon
    • -*
  • StandardDecimals
    • -*
  • NullDate
    • -*
  • DefaultTabStop
    • -*
  • IgnoreCase
    • -*
  • CalcAsShown
    • -*
  • MatchWholeCell
    • -*
  • SpellOnline
    • -*
  • LookUpLabels
    • -*
  • RegularExpressions
    • -*
  • ForbiddenCharacters
    • -*
  • HasDrawPages
    • -*
  • Wildcards
    • -*

-* Properties testing is automated by lib.MultiPropertyTest. -* @see com.sun.star.sheet.SpreadsheetDocumentSettings -*/ -public class _SpreadsheetDocumentSettings extends MultiPropertyTest { - /** - *This class is destined to custom test of property NullDate. - */ - protected PropertyTester DateTester = new PropertyTester() { - @Override - protected Object getNewValue(String propName, Object oldValue) { - Date date = (Date) oldValue; - Date newDate = new Date((short) (date.Day - 1), date.Month, - date.Year); - - return newDate; - } - }; - - /** - *This class is destined to custom test of property ForbiddenCharacters. - */ - protected PropertyTester ChrTester = new PropertyTester() { - @Override - protected Object getNewValue(String propName, Object oldValue) { - return new ForbiddenChrTest(); - } - - @Override - protected boolean compare(Object obj1, Object obj2) { - Locale loc = new Locale("ru", "RU", ""); - XForbiddenCharacters fc1 = UnoRuntime.queryInterface( - XForbiddenCharacters.class, - obj1); - XForbiddenCharacters fc2 = UnoRuntime.queryInterface( - XForbiddenCharacters.class, - obj2); - boolean has1 = fc1.hasForbiddenCharacters(loc); - boolean has2 = fc2.hasForbiddenCharacters(loc); - - return has1 == has2; - } - }; - - /** - * Test property NullDate using custom PropertyTest. - */ - public void _NullDate() { - testProperty("NullDate", DateTester); - } - - /** - * Test property ForbiddenCharacters using custom PropertyTest. - */ - public void _ForbiddenCharacters() { - testProperty("ForbiddenCharacters", ChrTester); - } - - /** - * Class implements interface XForbiddenCharacters. - * It's destined to custom test of property ForbiddenCharacters. - * Feature of the class that it supports forbidden characters - * for russian locale. - * @see com.sun.star.i18n.XForbiddenCharacters - */ - protected static class ForbiddenChrTest implements XForbiddenCharacters { - protected Locale locale = new Locale("ru", "RU", ""); - protected ForbiddenCharacters chrs = new ForbiddenCharacters("q", "w"); - - public ForbiddenCharacters getForbiddenCharacters(Locale rLocale) - throws com.sun.star.container.NoSuchElementException { - if (rLocale.Country.equals(locale.Country) && - rLocale.Language.equals(locale.Language) && - rLocale.Variant.equals(locale.Variant)) { - return chrs; - } - - throw new com.sun.star.container.NoSuchElementException(); - } - - public void setForbiddenCharacters(Locale rLocale, - ForbiddenCharacters rForbiddenCharacters) { - } - - public void removeForbiddenCharacters(Locale rLocale) { - } - - public boolean hasForbiddenCharacters(Locale rLocale) { - return rLocale.Country.equals(locale.Country) && - rLocale.Language.equals(locale.Language) && - rLocale.Variant.equals(locale.Variant); - } - } -} -- cgit v1.2.3