strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CppunitTest_sw_apitests

Browse source 
For one, a dependency was missing to avoid

> [_RUN_____] (anonymous namespace)::SwXAutoTextContainer::testGetByName
> standard
> test/source/container/xnameaccess.cxx:30:(anonymous namespace)::SwXAutoTextContainer::testGetByName
> unexpected exception caught
> - Caught: unknown.
>
> (anonymous namespace)::SwXAutoTextContainer::testGetByName finished in: 147ms
> [_RUN_____] (anonymous namespace)::SwXAutoTextContainer::testGetElementNames
> standard
> (anonymous namespace)::SwXAutoTextContainer::testGetElementNames finished in: 0ms
> [_RUN_____] (anonymous namespace)::SwXAutoTextContainer::testHasByName
> standard
> test/source/container/xnameaccess.cxx:48:(anonymous namespace)::SwXAutoTextContainer::testHasByName
> assertion failed
> - Expression: xNA->hasByName(m_aName)
>
> (anonymous namespace)::SwXAutoTextContainer::testHasByName finished in: 0ms
> [_RUN_____] (anonymous namespace)::SwXAutoTextContainer::testGetCount
> standard
> test/source/container/xindexaccess.cxx:26:(anonymous namespace)::SwXAutoTextContainer::testGetCount
> equality assertion failed
> - Expected: 3
> - Actual  : 1
>
> (anonymous namespace)::SwXAutoTextContainer::testGetCount finished in: 0ms
> [_RUN_____] (anonymous namespace)::SwXAutoTextContainer::testGetByIndex
> standard
> test/source/container/xindexaccess.cxx:32:(anonymous namespace)::SwXAutoTextContainer::testGetByIndex
> equality assertion failed
> - Expected: 3
> - Actual  : 1
>
> (anonymous namespace)::SwXAutoTextContainer::testGetByIndex finished in: 0ms

And for another, executing the XAutoTextContainer test code in
SwXAutoTextContainer corrupted instdir/,  testInsertNewByName creating a
spurious instdir/share/autotext/en-US/crdbus50Insert.bau, and testRemoveByName
removing instdir/share/autotext/en-US/crdbus50.bau, which caused subsequent runs
of the CppunitTest to fail with

> [_RUN_____] (anonymous namespace)::SwXAutoTextContainer::testGetCount
> standard
> /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/test/source/container/xindexaccess.cxx:26:(anonymous namespace)::SwXAutoTextContainer::testGetCount
> equality assertion failed
> - Expected: 3
> - Actual  : 4
>
> (anonymous namespace)::SwXAutoTextContainer::testGetCount finished in: 0ms
> [_RUN_____] (anonymous namespace)::SwXAutoTextContainer::testGetByIndex
> standard
> /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/test/source/container/xindexaccess.cxx:32:(anonymous namespace)::SwXAutoTextContainer::testGetByIndex
> equality assertion failed
> - Expected: 3
> - Actual  : 4
>
> (anonymous namespace)::SwXAutoTextContainer::testGetByIndex finished in: 0ms

(<https://ci.libreoffice.org//job/lo_tb_master_linux_dbg/44666/>).  So this
commit reverts that part of 7b999ca228 "tdf#45904:
Move _XAutoTextContainer Java tests to C++" for now.

Change-Id: I46387d3fea21706846f2c1ba4c462402f9343fdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156192
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2023-08-28 13:21:04 +02:00
parent 0e51bb2c6b
commit 78a3448f05
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sw/CppunitTest_sw_apitests.mk
View file

@ -106,4 +106,6 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_apitests, \
svx \ svx \
)) ))
$(call gb_CppunitTest_get_target,sw_apitests): $(call gb_AllLangPackage_get_target,autotextshare)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

6
sw/qa/api/SwXAutoTextContainer.cxx
View file

@ -31,8 +31,7 @@ namespace
class SwXAutoTextContainer final : public UnoApiTest, class SwXAutoTextContainer final : public UnoApiTest,
public apitest::XElementAccess, public apitest::XElementAccess,
public apitest::XIndexAccess, public apitest::XIndexAccess,
public apitest::XNameAccess, public apitest::XNameAccess
public apitest::XAutoTextContainer
{ {
public: public:
SwXAutoTextContainer() SwXAutoTextContainer()
@ -40,7 +39,6 @@ public:
, XElementAccess(cppu::UnoType<text::XAutoTextGroup>::get()) , XElementAccess(cppu::UnoType<text::XAutoTextGroup>::get())
, XIndexAccess(3) , XIndexAccess(3)
, XNameAccess("crdbus50") , XNameAccess("crdbus50")
, XAutoTextContainer("crdbus50")
{ {
} }
@ -70,8 +68,6 @@ public:
CPPUNIT_TEST(testGetByIndex); CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetElementType); CPPUNIT_TEST(testGetElementType);
CPPUNIT_TEST(testHasElements); CPPUNIT_TEST(testHasElements);
CPPUNIT_TEST(testInsertNewByName);
CPPUNIT_TEST(testRemoveByName);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
}; };