dev/null |binary sc/CppunitTest_sc_inlinearray.mk | 63 ----- sc/Module_sc.mk | 1 sc/qa/unit/InlineArray.cxx | 70 ----- sc/qa/unit/data/functions/spreadsheet/fods/lookup.fods | 203 ++++++++++++++++- 5 files changed, 202 insertions(+), 135 deletions(-)
New commits: commit aea7c4ecb85ed9d92f5fe1bbd9142d9b3a6d1c76 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jul 4 15:36:55 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Jul 4 17:11:18 2025 +0200 tdf#167134: implement test as sc_functions_test No need to reinvent the wheel Change-Id: Iefffe2df9163fb8703eb74563b4031517c6aebba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187399 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sc/CppunitTest_sc_inlinearray.mk b/sc/CppunitTest_sc_inlinearray.mk deleted file mode 100644 index 97d3dd50dd3c..000000000000 --- a/sc/CppunitTest_sc_inlinearray.mk +++ /dev/null @@ -1,63 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# 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/. -# -#************************************************************************* - -$(eval $(call gb_CppunitTest_CppunitTest,sc_inlinearray)) - -$(eval $(call gb_CppunitTest_use_externals,sc_inlinearray, \ - boost_headers \ - mdds_headers \ - libxml2 \ -)) - -$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_inlinearray)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sc_inlinearray, \ - sc/qa/unit/InlineArray \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sc_inlinearray, \ - cppu \ - cppuhelper \ - sal \ - sc \ - scqahelper \ - sfx \ - subsequenttest \ - svl \ - svx \ - svxcore \ - test \ - tl \ - unotest \ - utl \ - vcl \ -)) - -$(eval $(call gb_CppunitTest_set_include,sc_inlinearray,\ - -I$(SRCDIR)/sc/source/ui/inc \ - -I$(SRCDIR)/sc/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_sdk_api,sc_inlinearray)) - -$(eval $(call gb_CppunitTest_use_ure,sc_inlinearray)) -$(eval $(call gb_CppunitTest_use_vcl,sc_inlinearray)) - -$(eval $(call gb_CppunitTest_use_rdb,sc_inlinearray,services)) - -$(eval $(call gb_CppunitTest_use_configuration,sc_inlinearray)) - -$(eval $(call gb_CppunitTest_add_arguments,sc_inlinearray, \ - -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index b8e357f8dd71..3e1dc0d120e0 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_cache_test \ CppunitTest_sc_parallelism \ CppunitTest_sc_shapetest \ - CppunitTest_sc_inlinearray \ )) endif diff --git a/sc/qa/unit/InlineArray.cxx b/sc/qa/unit/InlineArray.cxx deleted file mode 100644 index cd17895bacba..000000000000 --- a/sc/qa/unit/InlineArray.cxx +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- 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/. - */ - -#include "helper/qahelper.hxx" // contains class ScModelTestBase - -#include <sfx2/dispatch.hxx> - -using namespace css; - -class ScInlineArray : public ScModelTestBase -{ -public: - ScInlineArray() - : ScModelTestBase(u"sc/qa/unit/data"_ustr) - { - } -}; - -/* These tests cover cases that use inline arrays. The actual visible separators depend on user - settings. The default of these settings depend on local. The markup in the ODF file uses the - semicolon as column separator and the pipe symbol as row separator. These separators are used - in below comments.*/ - -CPPUNIT_TEST_FIXTURE(ScInlineArray, testLOOKUP_special) -{ - // LOOKUP has some special rules. These are tested here. - - // Load a document with test cases and force recalculation. - createScDoc("ods/LOOKUP_inlineArray.ods"); - dispatchCommand(mxComponent, u".uno:CalculateHard"_ustr, {}); - ScDocument* pDoc = getScDoc(); - - // Test results. Explanations can be found in the test file. - CPPUNIT_ASSERT_EQUAL(u"Y"_ustr, pDoc->GetString(ScAddress(1, 1, 0))); - CPPUNIT_ASSERT_EQUAL(u"#N/A"_ustr, pDoc->GetString(ScAddress(1, 2, 0))); - CPPUNIT_ASSERT_EQUAL(u"Z"_ustr, pDoc->GetString(ScAddress(1, 5, 0))); - CPPUNIT_ASSERT_EQUAL(u"10"_ustr, pDoc->GetString(ScAddress(1, 6, 0))); - CPPUNIT_ASSERT_EQUAL(u"#N/A"_ustr, pDoc->GetString(ScAddress(1, 8, 0))); - CPPUNIT_ASSERT_EQUAL(u"200"_ustr, pDoc->GetString(ScAddress(1, 11, 0))); - CPPUNIT_ASSERT_EQUAL(u"200"_ustr, pDoc->GetString(ScAddress(1, 12, 0))); - CPPUNIT_ASSERT_EQUAL(u"6"_ustr, pDoc->GetString(ScAddress(1, 13, 0))); -} - -CPPUNIT_TEST_FIXTURE(ScInlineArray, testTdf67134) -{ - // Search and result array in LOOKUP need not have the same direction. - // This also applies to inline arrays. - // Before the fix the #N/A error was returned in case of different directions. - - // Load a document with test cases and force recalculation. - createScDoc("ods/tdf167134_LOOKUP_inlineArray.ods"); - dispatchCommand(mxComponent, u".uno:CalculateHard"_ustr, {}); - ScDocument* pDoc = getScDoc(); - - // A2: string "D" - // B2: formula =LOOKUP(A2;{"B";"C";"D"};{"X"|"Y"|"Z"}) - CPPUNIT_ASSERT_EQUAL(u"Z"_ustr, pDoc->GetString(ScAddress(1, 1, 0))); - // B3: formula =LOOkUP(A2;{"B"|"C"|"D"};{"X";"Y";"Z"}) - CPPUNIT_ASSERT_EQUAL(u"Z"_ustr, pDoc->GetString(ScAddress(1, 2, 0))); -} - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/unit/data/functions/spreadsheet/fods/lookup.fods b/sc/qa/unit/data/functions/spreadsheet/fods/lookup.fods index 0e41537c7394..6e7ed5692e4f 100644 --- a/sc/qa/unit/data/functions/spreadsheet/fods/lookup.fods +++ b/sc/qa/unit/data/functions/spreadsheet/fods/lookup.fods @@ -19110,6 +19110,207 @@ <table:table-cell table:style-name="ce31" table:number-columns-repeated="5"/> <table:table-cell table:number-columns-repeated="14"/> </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=LOOKUP([.K721]; {"B";"C";"D"}; {"X"|"Y"|"Z"})" office:value-type="string" office:string-value="Z" calcext:value-type="string"> + <text:p>Z</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce67" office:value-type="string" calcext:value-type="string"> + <text:p>Z</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A721]=[.B721]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A721])" office:value-type="string" office:string-value="=LOOKUP(K721; {"B"."C"."D"}; {"X";"Y";"Z"})" calcext:value-type="string"> + <text:p>=LOOKUP(K721; {"B"."C"."D"}; {"X";"Y";"Z"})</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Search and result array need not have the same direction.</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell table:style-name="ce82" office:value-type="string" calcext:value-type="string"> + <text:p>D</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce31" table:number-columns-repeated="5"/> + <table:table-cell table:number-columns-repeated="14"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=LOOKUP([.K721]; {"B"|"C"|"D"}; {"X";"Y";"Z"})" office:value-type="string" office:string-value="Z" calcext:value-type="string"> + <text:p>Z</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce67" office:value-type="string" calcext:value-type="string"> + <text:p>Z</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A722]=[.B722]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A722])" office:value-type="string" office:string-value="=LOOKUP(K721; {"B";"C";"D"}; {"X"."Y"."Z"})" calcext:value-type="string"> + <text:p>=LOOKUP(K721; {"B";"C";"D"}; {"X"."Y"."Z"})</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="28"/> + </table:table-row> + <table:table-row table:style-name="ro8"> + <table:table-cell table:formula="of:=LOOKUP([.K723]; {"B";"C"}; {"X";"Y";"Z"})" office:value-type="string" office:string-value="Y" calcext:value-type="string"> + <text:p>Y</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Y</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A723]=[.B723]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A723])" office:value-type="string" office:string-value="=LOOKUP(K723; {"B"."C"}; {"X"."Y"."Z"})" calcext:value-type="string"> + <text:p>=LOOKUP(K723; {"B"."C"}; {"X"."Y"."Z"})</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce48" office:value-type="string" calcext:value-type="string"><text:p>Search and result vector need not have the same size. If the index of the value found in the search vector is larger than the size of the result vector, the result vector is not extended. Instead the #N/A error is returned. That is different from the rule for cell ranges as parameter.</text:p><text:p>Different directions for search and result vector are allowed. Those cases are handled in file tdf167134_LOOKUP_inlineArray.ods</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>C</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="21"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=LOOKUP([.K724]; {"B";"C";"D"}; {"X";"Y"})" office:value-type="string" office:string-value="" calcext:value-type="error"> + <text:p>#N/A</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>#N/A</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=ISERROR([.A724])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A724])" office:value-type="string" office:string-value="=LOOKUP(K724; {"B"."C"."D"}; {"X"."Y"})" calcext:value-type="string"> + <text:p>=LOOKUP(K724; {"B"."C"."D"}; {"X"."Y"})</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="6"/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>D</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="21"/> + </table:table-row> + <table:table-row table:style-name="ro9"> + <table:table-cell table:formula="of:=LOOKUP([.K725]; {1;3;"B";"C";"D"};{10;20;"X";"Y";"Z"})" office:value-type="string" office:string-value="Z" calcext:value-type="string"> + <text:p>Z</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Z</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A725]=[.B725]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A725])" office:value-type="string" office:string-value="=LOOKUP(K725; {1.3."B"."C"."D"};{10.20."X"."Y"."Z"})" calcext:value-type="string"> + <text:p>=LOOKUP(K725; {1.3."B"."C"."D"};{10.20."X"."Y"."Z"})</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce48" office:value-type="string" calcext:value-type="string"> + <text:p>Generally, LOOKUP uses the index of the largest value from the search vector that is less or equal to the query value. Numbers must be sorted before strings in the search vector.</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>E</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="21"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=LOOKUP([.K726]; {1;3;"B";"C";"D"};{10;20;"X";"Y";"Z"})" office:value-type="float" office:value="10" calcext:value-type="float"> + <text:p>10</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="10" calcext:value-type="float"> + <text:p>10</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A726]=[.B726]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A726])" office:value-type="string" office:string-value="=LOOKUP(K726; {1.3."B"."C"."D"};{10.20."X"."Y"."Z"})" calcext:value-type="string"> + <text:p>=LOOKUP(K726; {1.3."B"."C"."D"};{10.20."X"."Y"."Z"})</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="6"/> + <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="21"/> + </table:table-row> + <table:table-row table:style-name="ro10"> + <table:table-cell table:formula="of:=LOOKUP([.K727]; {1;2;"B";"C";"D"};{10;20;"X";"Y";"Z"})" office:value-type="string" office:string-value="" calcext:value-type="error"> + <text:p>#N/A</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>#N/A</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=ISERROR([.A727])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A727])" office:value-type="string" office:string-value="=LOOKUP(K727; {1.2."B"."C"."D"};{10.20."X"."Y"."Z"})" calcext:value-type="string"> + <text:p>=LOOKUP(K727; {1.2."B"."C"."D"};{10.20."X"."Y"."Z"})</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce48" office:value-type="string" calcext:value-type="string"> + <text:p>Only if the query value is a string and the found value in the search vector would be a number following the above rule, then a #N/A error is returned.</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>A</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="21"/> + </table:table-row> + <table:table-row table:style-name="ro11"> + <table:table-cell table:formula="of:=LOOKUP([.K728];{1;2;3;4|10;20;30;40|100;200;300;400})" office:value-type="float" office:value="200" calcext:value-type="float"> + <text:p>200</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="200" calcext:value-type="float"> + <text:p>200</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A728]=[.B728]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A728])" office:value-type="string" office:string-value="=LOOKUP(K728;{1.2.3.4;10.20.30.40;100.200.300.400})" calcext:value-type="string"> + <text:p>=LOOKUP(K728;{1.2.3.4;10.20.30.40;100.200.300.400})</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce48" office:value-type="string" calcext:value-type="string"><text:p>When the LOOKUP function is used with two parameters, then a horizontal search direction is used if the count of rows is less than the count of columns. Otherwise the search direction is vertical. The first column/row is used as search vector, the last column/row is used as result vector.</text:p><text:p>In the third example, the value 4 in the first column is the largest value in the search vector that is smaller or equal to the query value 5. Thus the index 2 is used for the result vector. The value 6 in the last column is the value at index 2 in the result vector. </text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="21"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=LOOKUP([.K729];{1;10;100|2;20;200|3;30;300|4;40;400})" office:value-type="float" office:value="200" calcext:value-type="float"> + <text:p>200</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="200" calcext:value-type="float"> + <text:p>200</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A729]=[.B729]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A729])" office:value-type="string" office:string-value="=LOOKUP(K729;{1.10.100;2.20.200;3.30.300;4.40.400})" calcext:value-type="string"> + <text:p>=LOOKUP(K729;{1.10.100;2.20.200;3.30.300;4.40.400})</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="6"/> + <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="21"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=LOOKUP([.K730];{1;2;3|4;5;6|7;8;9})" office:value-type="float" office:value="6" calcext:value-type="float"> + <text:p>6</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="6" calcext:value-type="float"> + <text:p>6</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A730]=[.B730]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:formula="of:=FORMULA([.A730])" office:value-type="string" office:string-value="=LOOKUP(K730;{1.2.3;4.5.6;7.8.9})" calcext:value-type="string"> + <text:p>=LOOKUP(K730;{1.2.3;4.5.6;7.8.9})</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="6"/> + <table:table-cell office:value-type="float" office:value="5" calcext:value-type="float"> + <text:p>5</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="21"/> + </table:table-row> <table:table-row table:style-name="ro5"> <table:table-cell table:number-columns-repeated="13"/> <table:table-cell table:style-name="ce31" table:number-columns-repeated="5"/> @@ -19350,4 +19551,4 @@ </table:named-expressions> </office:spreadsheet> </office:body> -</office:document> \ No newline at end of file +</office:document> diff --git a/sc/qa/unit/data/ods/LOOKUP_inlineArray.ods b/sc/qa/unit/data/ods/LOOKUP_inlineArray.ods deleted file mode 100644 index ebd1e0d3dec1..000000000000 Binary files a/sc/qa/unit/data/ods/LOOKUP_inlineArray.ods and /dev/null differ diff --git a/sc/qa/unit/data/ods/tdf167134_LOOKUP_inlineArray.ods b/sc/qa/unit/data/ods/tdf167134_LOOKUP_inlineArray.ods deleted file mode 100644 index c575feae7207..000000000000 Binary files a/sc/qa/unit/data/ods/tdf167134_LOOKUP_inlineArray.ods and /dev/null differ
