[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests
Jens Carl
j.carl43 at gmx.de
Tue Aug 8 05:08:44 UTC 2017
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv | 16
qadevOOo/tests/java/ifc/sheet/_DataPilotField.java | 164 ----------
3 files changed, 181 deletions(-)
New commits:
commit 28ada7805b87758b20ded9807b57f780570e08a7
Author: Jens Carl <j.carl43 at gmx.de>
Date: Mon Aug 7 19:59:59 2017 +0000
tdf#45905 Remove/disable obsolete _DataPilotField Java tests
The _DataPilotField tests are already written in C++ since commit
95780ec73990f96dc16fc677c895d00fa1360008.
Change-Id: Ia147acd4d42894c9de373bbe93ae5759095e8ac6
Reviewed-on: https://gerrit.libreoffice.org/40856
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 89a0f231264a..553e5cb521ff 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/_CellAreaLink \
qadevOOo/tests/java/ifc/sheet/_DatabaseImportDescriptor \
qadevOOo/tests/java/ifc/sheet/_DatabaseRange \
- qadevOOo/tests/java/ifc/sheet/_DataPilotField \
qadevOOo/tests/java/ifc/sheet/_DataPilotItem \
qadevOOo/tests/java/ifc/sheet/_DocumentSettings \
qadevOOo/tests/java/ifc/sheet/_FunctionDescription \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv
index 3cab66e718f4..7c930e8cfc75 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotFieldObj.csv
@@ -1,21 +1,5 @@
"ScDataPilotFieldObj";"com::sun::star::sheet::XDataPilotFieldGrouping#optional";"createNameGroup()"
"ScDataPilotFieldObj";"com::sun::star::sheet::XDataPilotFieldGrouping#optional";"createDateGroup()"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"Orientation"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"Function"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"SelectedPage#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"UseSelectedPage#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"UsedHierarchy#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"HasSortInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"SortInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"HasLayoutInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"LayoutInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"HasAutoShowInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"AutoShowInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"HasReference#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"Reference#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"IsGroupField#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"GroupInfo#optional"
-"ScDataPilotFieldObj";"com::sun::star::sheet::DataPilotField";"ShowEmpty#optional"
"ScDataPilotFieldObj";"com::sun::star::container::XNamed";"getName()"
"ScDataPilotFieldObj";"com::sun::star::container::XNamed";"setName()"
"ScDataPilotFieldObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java b/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java
deleted file mode 100644
index 13debc4a32cd..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java
+++ /dev/null
@@ -1,164 +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 com.sun.star.sheet.DataPilotFieldAutoShowInfo;
-import com.sun.star.sheet.DataPilotFieldLayoutInfo;
-import com.sun.star.sheet.DataPilotFieldReference;
-import com.sun.star.sheet.DataPilotFieldSortInfo;
-import lib.MultiPropertyTest;
-
-/**
-* Testing <code>com.sun.star.sheet.DataPilotField</code>
-* service properties :
-* <ul>
-* <li><code> Orientation</code></li>
-* <li><code> Function</code></li>
-* </ul> <p>
-* Properties testing is automated by <code>lib.MultiPropertyTest</code>.
-* @see com.sun.star.sheet.DataPilotField
-*/
-public class _DataPilotField extends MultiPropertyTest {
-
- /**
- *This class is destined to custom test of property <code>SortInfo</code>.
- */
- protected PropertyTester SortInfoTester = new PropertyTester() {
- @Override
- protected Object getNewValue(String propName, Object oldValue) {
- DataPilotFieldSortInfo sortInfo = new DataPilotFieldSortInfo();
- sortInfo.Mode = com.sun.star.sheet.DataPilotFieldSortMode.MANUAL;
- sortInfo.IsAscending = false;
- sortInfo.Field = "COL1";
- log.println("Having Value and returning a new one");
- return sortInfo.equals(oldValue) ? null : sortInfo;
- }
- };
-
- /**
- * Test property <code>SortInfo</code> using custom <code>PropertyTest</code>.
- */
- public void _SortInfo() {
- testProperty("SortInfo", SortInfoTester);
- }
-
- public void _HasSortInfo() {
- requiredMethod("SortInfo");
- testProperty("HasSortInfo");
- }
-
- /**
- *This class is destined to custom test of property <code>LayoutInfo</code>.
- */
- protected PropertyTester LayoutInfoTester = new PropertyTester() {
- @Override
- protected Object getNewValue(String propName, Object oldValue) {
- DataPilotFieldLayoutInfo layoutInfo = new DataPilotFieldLayoutInfo();
- layoutInfo.LayoutMode = com.sun.star.sheet.DataPilotFieldLayoutMode.OUTLINE_SUBTOTALS_BOTTOM;
- layoutInfo.AddEmptyLines = true;
- log.println("Having Value and returning a new one");
- return layoutInfo.equals(oldValue) ? null : layoutInfo;
- }
- };
-
- /**
- * Test property <code>LayoutInfo</code> using custom <code>PropertyTest</code>.
- */
- public void _LayoutInfo() {
- testProperty("LayoutInfo", LayoutInfoTester);
- }
-
- public void _HasLayoutInfo() {
- requiredMethod("LayoutInfo");
- testProperty("HasLayoutInfo");
- }
-
- /**
- *This class is destined to custom test of property <code>AutoShowInfo</code>.
- */
- protected PropertyTester AutoShowInfoTester = new PropertyTester() {
- @Override
- protected Object getNewValue(String propName, Object oldValue) {
- DataPilotFieldAutoShowInfo AutoShowInfo = new DataPilotFieldAutoShowInfo();
- AutoShowInfo.DataField = "Col1";
- AutoShowInfo.IsEnabled = true;
- log.println("Having Value and returning a new one");
- return AutoShowInfo.equals(oldValue) ? null : AutoShowInfo;
- }
- };
-
- /**
- * Test property <code>AutoShowInfo</code> using custom <code>PropertyTest</code>.
- */
- public void _AutoShowInfo() {
- testProperty("AutoShowInfo", AutoShowInfoTester);
- }
-
- public void _HasAutoShowInfo() {
- requiredMethod("AutoShowInfo");
- testProperty("HasAutoShowInfo");
- }
-
- /**
- *This class is destined to custom test of property <code>Reference</code>.
- */
- protected PropertyTester ReferenceTester = new PropertyTester() {
- @Override
- protected Object getNewValue(String propName, Object oldValue) {
- DataPilotFieldReference Reference = new DataPilotFieldReference();
- Reference.ReferenceField="Col1";
- Reference.ReferenceItemType = com.sun.star.sheet.DataPilotFieldReferenceItemType.NAMED;
- log.println("Having Value and returning a new one");
- return Reference.equals(oldValue) ? null : Reference;
- }
- };
-
- /**
- * Test property <code>Reference</code> using custom <code>PropertyTest</code>.
- */
- public void _Reference() {
- testProperty("Reference", ReferenceTester);
- }
-
- public void _HasReference() {
- requiredMethod("Reference");
- testProperty("HasReference");
- }
-
- /*
- * this property can only set a true value to false, fo ungrouping purposes
- */
- public void _IsGroupField() {
- boolean result = true;
- try {
- Boolean propValue = (Boolean) oObj.getPropertyValue ("IsGroupField");
- if (propValue.booleanValue ()) {
- oObj.setPropertyValue ("IsGroupField", Boolean.FALSE);
- Boolean propV = (Boolean) oObj.getPropertyValue ("IsGroupField");
- result = !propV.booleanValue ();
- }
- } catch (Exception e) {
- log.println ("Exception while getting Property 'IsGroupField'"+e);
- result = false;
- }
- tRes.tested ("IsGroupField",result);
- }
-}
-
-
More information about the Libreoffice-commits
mailing list