[Libreoffice-commits] core.git: 2 commits - sw/CppunitTest_sw_uiwriter.mk sw/qa

[Stephan Bergmann (via logerrit)]

 sw/CppunitTest_sw_uiwriter.mk      |    4 ++++
 sw/qa/extras/uiwriter/uiwriter.cxx |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit de4dfa06c9b353e3c34dfea14b38325a87f6ec8a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Sep 20 18:03:41 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Sep 20 23:04:17 2019 +0200

    Use CPPUNIT_ASSERT_GREATER(e,a) instead of CPPUNIT_ASSERT(e<a)
    
    Change-Id: Ib7f74d1afdf038726842d7fc0b33555db6611270
    Reviewed-on: https://gerrit.libreoffice.org/79310
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index b4665cd17b3d..10e9ee644983 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5052,12 +5052,12 @@ void SwUiWriterTest::testTdf98987()
     sal_Int32 nRectangle1 = getXPath(pXmlDoc, "/root/page/body/txt/anchored/SwAnchoredDrawObject[2]/bounds", "top").toInt32();
     assertXPath(pXmlDoc, "/root/page/body/txt/anchored/SwAnchoredDrawObject[1]/SdrObject", "name", "Rectangle 2");
     sal_Int32 nRectangle2 = getXPath(pXmlDoc, "/root/page/body/txt/anchored/SwAnchoredDrawObject[1]/bounds", "top").toInt32();
-    CPPUNIT_ASSERT(nRectangle1 < nRectangle2);
+    CPPUNIT_ASSERT_GREATER(nRectangle1, nRectangle2);
 
     assertXPath(pXmlDoc, "/root/page/body/txt/anchored/SwAnchoredDrawObject[3]/SdrObject", "name", "Rectangle 3");
     sal_Int32 nRectangle3 = getXPath(pXmlDoc, "/root/page/body/txt/anchored/SwAnchoredDrawObject[3]/bounds", "top").toInt32();
     // This failed: the 3rd rectangle had a smaller "top" value than the 2nd one, it even overlapped with the 1st one.
-    CPPUNIT_ASSERT(nRectangle2 < nRectangle3);
+    CPPUNIT_ASSERT_GREATER(nRectangle2, nRectangle3);
 }
 
 void SwUiWriterTest::testTdf99004()
commit e2cca4cc34cf34d4a109905f81924bea4ea84418
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Sep 20 17:45:58 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Sep 20 23:03:53 2019 +0200

    Missing test dependency
    
    `make clean && make CppunitTest_sw_uiconfig` failed with
    
    > Test name: SwUiWriterTest::testClassificationPaste
    > An uncaught exception of type com.sun.star.io.NotConnectedException
    > -
    
    because instdir/share/classification/example.xml was missing in
    SfxClassificationHelper::Impl::parsePolicy
    (sfx2/source/view/classificationhelper.cxx).
    
    Change-Id: I0c2aeff1a6192d8fac3b01f63fc75f4ce758b809
    Reviewed-on: https://gerrit.libreoffice.org/79308
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index c649bd1ba12e..d31c61f432f4 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -71,6 +71,10 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_uiwriter, \
     modules/swriter \
 ))
 
+$(eval $(call gb_CppunitTest_use_packages,sw_uiwriter, \
+    sfx2_classification \
+))
+
 $(call gb_CppunitTest_get_target,sw_uiwriter): \
     $(call gb_Library_get_target,textconv_dict)