[Libreoffice-commits] core.git: framework/qa include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
Jens Carl
j.carl43 at gmx.de
Fri Nov 3 03:09:07 UTC 2017
framework/qa/complex/api_internal/api.lst | 1
include/test/sheet/xsheetconditionalentry.hxx | 36 ++
qadevOOo/Jar_OOoRunner.mk | 2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv | 2
qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java | 66 ---
qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java | 170 ----------
sc/qa/extras/sctableconditionalentryobj.cxx | 10
sc/qa/unoapi/sc_7.sce | 1
test/Library_subsequenttest.mk | 1
test/source/sheet/xsheetconditionalentry.cxx | 37 ++
10 files changed, 82 insertions(+), 244 deletions(-)
New commits:
commit 6bddeb4de19685c1ce1a3c1f9bd32cffb6b14bc6
Author: Jens Carl <j.carl43 at gmx.de>
Date: Wed Nov 1 20:58:09 2017 +0000
tdf#45904 Move Java _XSheetConditionalEntry tests to C++
Change-Id: I51924e69183260ba0eba94c3a14bde252c24cc18
Reviewed-on: https://gerrit.libreoffice.org/44182
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index ac0c62e2e7f5..44ca4d40ff91 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -131,7 +131,6 @@ job131=sc.ScStyleFamilyObj
job132=sc.ScStyleObj
job134=sc.ScTableColumnObj
job135=sc.ScTableColumnsObj
-job136=sc.ScTableConditionalEntry
job137=sc.ScTableConditionalFormat
job138=sc.ScTableRowObj
job139=sc.ScTableValidationObj
diff --git a/include/test/sheet/xsheetconditionalentry.hxx b/include/test/sheet/xsheetconditionalentry.hxx
new file mode 100644
index 000000000000..449e3534c333
--- /dev/null
+++ b/include/test/sheet/xsheetconditionalentry.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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_XSHEETCONDITIONALENTRY_HXX
+#define INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRY_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 XSheetConditionalEntry
+{
+public:
+ virtual css::uno::Reference< css::uno::XInterface > init() =0;
+
+ void testGetSetStyleName();
+
+protected:
+ ~XSheetConditionalEntry() {}
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRY_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index e85731f3f3a9..4af94611e1b9 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -622,7 +622,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer \
qadevOOo/tests/java/ifc/sheet/_XSheetCellRanges \
qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries \
- qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry \
qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \
qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \
qadevOOo/tests/java/ifc/style/_CharacterProperties \
@@ -1103,7 +1102,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase \
qadevOOo/tests/java/mod/_sc/ScTableColumnObj \
qadevOOo/tests/java/mod/_sc/ScTableColumnsObj \
- qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry \
qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat \
qadevOOo/tests/java/mod/_sc/ScTableRowObj \
qadevOOo/tests/java/mod/_sc/ScTableRowsObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv
deleted file mode 100644
index 5de029653f0c..000000000000
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalEntry.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScTableConditionalEntry";"com::sun::star::sheet::XSheetConditionalEntry";"getStyleName()"
-"ScTableConditionalEntry";"com::sun::star::sheet::XSheetConditionalEntry";"setStyleName()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java
deleted file mode 100644
index 42fb687287f1..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntry.java
+++ /dev/null
@@ -1,66 +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.MultiMethodTest;
-
-import com.sun.star.sheet.XSheetConditionalEntry;
-
-/**
-* Testing <code>com.sun.star.sheet.XSheetConditionalEntry</code>
-* interface methods :
-* <ul>
-* <li><code> getStyleName()</code></li>
-* <li><code> setStyleName()</code></li>
-* </ul> <p>
-* @see com.sun.star.sheet.XSheetConditionalEntry
-*/
-public class _XSheetConditionalEntry extends MultiMethodTest {
-
- public XSheetConditionalEntry oObj = null;
- public String StyleName = null;
-
- /**
- * Test calls the method, stores and checks returned value. <p>
- * Has <b> OK </b> status if returned value isn't null. <p>
- */
- public void _getStyleName() {
- StyleName = oObj.getStyleName();
- tRes.tested("getStyleName()", StyleName != null);
- }
-
- /**
- * Test sets new value of style name, gets current style name and compares
- * returned value with value that was stored by method <code>getStyleName()
- * </code>. <p>
- * Has <b> OK </b> status if values aren't equal. <p>
- * The following method tests are to be completed successfully before :
- * <ul>
- * <li> <code> getStyleName() </code> : to have current style name </li>
- * </ul>
- */
- public void _setStyleName() {
- requiredMethod("getStyleName()");
- oObj.setStyleName("Heading");
- tRes.tested("setStyleName()", !StyleName.equals(oObj.getStyleName()));
- }
-
-} // finish class _XSheetConditionalEntry
-
-
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java
deleted file mode 100644
index 5bed10b5e414..000000000000
--- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java
+++ /dev/null
@@ -1,170 +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 mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-import util.utils;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.ConditionOperator;
-import com.sun.star.sheet.XSheetConditionalEntries;
-import com.sun.star.sheet.XSheetConditionalEntry;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.CellAddress;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.sheet.TableConditionalEntry</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-* <li> <code>com::sun::star::sheet::XSheetConditionalEntry</code></li>
-* <li> <code>com::sun::star::sheet::XSheetCondition</code></li>
-* </ul>
-* @see com.sun.star.sheet.TableConditionalEntry
-* @see com.sun.star.sheet.XSheetConditionalEntry
-* @see com.sun.star.sheet.XSheetCondition
-* @see ifc.sheet._XSheetConditionalEntry
-* @see ifc.sheet._XSheetCondition
-*/
-public class ScTableConditionalEntry extends TestCase {
- private XSpreadsheetDocument xSpreadsheetDoc = null;
-
- /**
- * Creates Spreadsheet document.
- */
- @Override
- protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
- // get a soffice factory object
- SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
- log.println( "creating a sheetdocument" );
- xSpreadsheetDoc = SOF.createCalcDoc(null);
- }
-
- /**
- * Disposes Spreadsheet document.
- */
- @Override
- protected void cleanup( TestParameters tParam, PrintWriter log ) {
- log.println( " disposing xSheetDoc " );
- XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ;
- util.DesktopTools.closeDoc(oComp);
- }
-
- /**
- * Creating a TestEnvironment for the interfaces to be tested.
- * Retrieves a collection of spreadsheets from the document and takes one of
- * them. Fills some cells of the spreadsheet. Retrieves value of the property
- * <code>'ConditionalFormat'</code> that is the collection of the conditions
- * of a conditional format. Adds new conditional entry to the collection
- * using the interface <code>XSheetConditionalEntries</code>. Sets new value
- * of the property <code>'ConditionalFormat'</code>. Obtains the conditional
- * entry with index 0 that is the instance of the service
- * <code>com.sun.star.sheet.TableConditionalEntry</code>.
- * @see com.sun.star.sheet.XSheetConditionalEntries
- * @see com.sun.star.sheet.TableConditionalEntry
- */
- @Override
- protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
-
- XInterface oObj = null;
- log.println("getting sheets");
- XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets();
-
- log.println("getting a sheet");
- XSpreadsheet oSheet = null;
- XIndexAccess oIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets);
-
- oSheet = (XSpreadsheet) AnyConverter.toObject(
- new Type(XSpreadsheet.class),oIndexAccess.getByIndex(0));
-
- log.println("filling some cells");
- try {
- oSheet.getCellByPosition(5, 5).setValue(15);
- oSheet.getCellByPosition(1, 4).setValue(10);
- oSheet.getCellByPosition(2, 0).setValue(-5.15);
- } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
- log.println("Exception occurred while filling cells");
- e.printStackTrace(log);
- }
-
- Object CFormat = null;
- XPropertySet Props = null;
-
- Props = UnoRuntime.queryInterface(XPropertySet.class, oSheet);
- CFormat = Props.getPropertyValue("ConditionalFormat");
- if (utils.isVoid(CFormat)) {
- log.println("Property 'ConditionalFormat' is void");
- }
-
- XSheetConditionalEntries xSCE = UnoRuntime.queryInterface(XSheetConditionalEntries.class, CFormat);
- xSCE.addNew(Conditions());
- Props.setPropertyValue("ConditionalFormat", xSCE);
- oObj = (XSheetConditionalEntry) AnyConverter.toObject(
- new Type(XSheetConditionalEntry.class),xSCE.getByIndex(0));
-
- log.println("creating a new environment for object");
- TestEnvironment tEnv = new TestEnvironment(oObj);
-
- return tEnv;
- } // finish method getTestEnvironment
-
- /**
- * Returns the array of the property values that was filled by condition
- * values.
- */
- protected PropertyValue[] Conditions() {
- PropertyValue[] con = new PropertyValue[5];
- CellAddress ca = new CellAddress();
- ca.Column = 1;
- ca.Row = 5;
- ca.Sheet = 0;
- con[0] = new PropertyValue();
- con[0].Name = "StyleName";
- con[0].Value = "Result2";
- con[1] = new PropertyValue();
- con[1].Name = "Formula1";
- con[1].Value = "$Sheet1.$B$5";
- con[2] = new PropertyValue();
- con[2].Name = "Formula2";
- con[2].Value = "";
- con[3] = new PropertyValue();
- con[3].Name = "Operator";
- con[3].Value = ConditionOperator.EQUAL;
- con[4] = new PropertyValue();
- con[4].Name = "SourcePosition";
- con[4].Value = ca;
- return con;
- }
-
-} // finish class ScTableConditionalEntry
-
diff --git a/sc/qa/extras/sctableconditionalentryobj.cxx b/sc/qa/extras/sctableconditionalentryobj.cxx
index be7432416cf4..4895d03dc9e1 100644
--- a/sc/qa/extras/sctableconditionalentryobj.cxx
+++ b/sc/qa/extras/sctableconditionalentryobj.cxx
@@ -8,6 +8,7 @@
*/
#include <test/calc_unoapi_test.hxx>
+#include <test/sheet/xsheetconditionalentry.hxx>
#include <test/sheet/xsheetcondition.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -34,9 +35,11 @@ using namespace com::sun::star;
namespace sc_apitest {
-#define NUMBER_OF_TESTS 4
+#define NUMBER_OF_TESTS 5
-class ScTableConditionalEntryObj : public CalcUnoApiTest, public apitest::XSheetCondition
+class ScTableConditionalEntryObj : public CalcUnoApiTest,
+ public apitest::XSheetConditionalEntry,
+ public apitest::XSheetCondition
{
public:
ScTableConditionalEntryObj();
@@ -47,6 +50,9 @@ public:
CPPUNIT_TEST_SUITE(ScTableConditionalEntryObj);
+ // XSheetConditionalEntry
+ CPPUNIT_TEST(testGetSetStyleName);
+
// XSheetCondition
CPPUNIT_TEST(testGetSetFormula1);
CPPUNIT_TEST(testGetSetFormula2);
diff --git a/sc/qa/unoapi/sc_7.sce b/sc/qa/unoapi/sc_7.sce
index 46d35f29d4cd..67dfcf739b30 100644
--- a/sc/qa/unoapi/sc_7.sce
+++ b/sc/qa/unoapi/sc_7.sce
@@ -20,7 +20,6 @@
# # i84656 -o sc.ScTabViewObj
# -o sc.ScTableColumnObj
-o sc.ScTableColumnsObj
--o sc.ScTableConditionalEntry
-o sc.ScTableConditionalFormat
# -o sc.ScTableRowObj
-o sc.ScTableRowsObj
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 87b7e0ecc7e7..21c5881ceca0 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/sheet/xsheetannotation \
test/source/sheet/xsheetannotations \
test/source/sheet/xsheetannotationshapesupplier \
+ test/source/sheet/xsheetconditionalentry \
test/source/sheet/xsheetcondition \
test/source/sheet/xsheetfilterable \
test/source/sheet/xsheetfilterdescriptor \
diff --git a/test/source/sheet/xsheetconditionalentry.cxx b/test/source/sheet/xsheetconditionalentry.cxx
new file mode 100644
index 000000000000..e6d3afcde020
--- /dev/null
+++ b/test/source/sheet/xsheetconditionalentry.cxx
@@ -0,0 +1,37 @@
+/* -*- 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/sheet/xsheetconditionalentry.hxx>
+
+#include <com/sun/star/sheet/XSheetConditionalEntry.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 XSheetConditionalEntry::testGetSetStyleName()
+{
+ uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry(init(), UNO_QUERY_THROW);
+ OUString aStyleName = xSheetConditionalEntry->getStyleName();
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get StyleName",
+ OUString("Result2"), aStyleName);
+
+ xSheetConditionalEntry->setStyleName("Heading");
+ CPPUNIT_ASSERT_MESSAGE("Unable to set StyleName",
+ aStyleName != xSheetConditionalEntry->getStyleName());
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
More information about the Libreoffice-commits
mailing list