[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - test/data test/httpwstest.cpp

[Libreoffice Gerrit user]

 test/data/shapes_impress.svg |   16 ++++++++--------
 test/httpwstest.cpp          |    2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 8b4f6ae2bfc1074fda0fc38b9ac454d0e1459c7f
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu May 9 14:25:21 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu May 9 14:40:32 2019 +0200

    Fix HTTPWSTest::testRenderShapeSelectionImpress() against product core
    
    This test only passed when core.git was built in a way so that '#if
    OSL_DEBUG_LEVEL > 0' was true (debug, dbgutil builds). Re-generate this
    against a product build, since 2 other tests already have references
    like that.
    
    We already have infrastructure for stripping <desc> XML elements from
    the actual result.
    
    (cherry picked from commit 1d32dc1742a2a51343af993939f0f51538de54aa)
    
    Change-Id: I9cdd53bf9625266d94313a90946270bfc266bd47
    Reviewed-on: https://gerrit.libreoffice.org/72042
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/test/data/shapes_impress.svg b/test/data/shapes_impress.svg
index 0cfac22b7..8087f20a7 100644
--- a/test/data/shapes_impress.svg
+++ b/test/data/shapes_impress.svg
@@ -36,18 +36,18 @@
  <g ooo:name="page1" class="Page">
   <g class="com.sun.star.drawing.CustomShape">
    <g id="id3">
-    <rect class="BoundingBox" stroke="none" fill="none" x="3301" y="5333" width="8385" height="6607"/><desc>150</desc><desc>139</desc><desc>133</desc><desc>132</desc><desc>111</desc>
-    <path fill="rgb(114,159,207)" stroke="none" d="M 7493,11938 L 3302,11938 3302,5334 11684,5334 11684,11938 7493,11938 Z"/><desc>140</desc><desc>139</desc><desc>132</desc><desc>512: XPATHSTROKE_SEQ_BEGIN</desc><desc>132</desc><desc>133</desc><desc>109</desc>
-    <path fill="none" stroke="rgb(52,101,164)" d="M 7493,11938 L 3302,11938 3302,5334 11684,5334 11684,11938 7493,11938 Z"/><desc>512: XPATHSTROKE_SEQ_END</desc><desc>140</desc>
+    <rect class="BoundingBox" stroke="none" fill="none" x="3301" y="5333" width="8385" height="6607"/>
+    <path fill="rgb(114,159,207)" stroke="none" d="M 7493,11938 L 3302,11938 3302,5334 11684,5334 11684,11938 7493,11938 Z"/>
+    <path fill="none" stroke="rgb(52,101,164)" d="M 7493,11938 L 3302,11938 3302,5334 11684,5334 11684,11938 7493,11938 Z"/>
    </g>
   </g>
   <g class="com.sun.star.drawing.CustomShape">
    <g id="id4">
-    <rect class="BoundingBox" stroke="none" fill="none" x="14477" y="4571" width="9656" height="8386"/><desc>150</desc><desc>139</desc><desc>133</desc><desc>132</desc><desc>111</desc>
-    <path fill="rgb(114,159,207)" stroke="none" d="M 19304,4572 C 22040,4572 24130,6387 24130,8763 24130,11139 22040,12954 19304,12954 16568,12954 14478,11139 14478,8763 14478,6387 16568,4572 19304,4572 Z M 14478,4572 L 14478,4572 Z M 24131,12955 L 24131,12955 Z"/><desc>140</desc><desc>139</desc><desc>132</desc><desc>512: XPATHSTROKE_SEQ_BEGIN</desc><desc>132</desc><desc>133</desc><desc>109</desc>
-    <path fill="none" stroke="rgb(52,101,164)" d="M 19304,4572 C 22040,4572 24130,6387 24130,8763 24130,11139 22040,12954 19304,12954 16568,12954 14478,11139 14478,8763 14478,6387 16568,4572 19304,4572 Z"/><desc>512: XPATHSTROKE_SEQ_END</desc><desc>140</desc><desc>139</desc><desc>132</desc><desc>512: XPATHSTROKE_SEQ_BEGIN</desc><desc>132</desc><desc>133</desc><desc>109</desc>
-    <path fill="none" stroke="rgb(52,101,164)" d="M 14478,4572 L 14478,4572 Z"/><desc>512: XPATHSTROKE_SEQ_END</desc><desc>140</desc><desc>139</desc><desc>132</desc><desc>512: XPATHSTROKE_SEQ_BEGIN</desc><desc>132</desc><desc>133</desc><desc>109</desc>
-    <path fill="none" stroke="rgb(52,101,164)" d="M 24131,12955 L 24131,12955 Z"/><desc>512: XPATHSTROKE_SEQ_END</desc><desc>140</desc>
+    <rect class="BoundingBox" stroke="none" fill="none" x="14477" y="4571" width="9656" height="8386"/>
+    <path fill="rgb(114,159,207)" stroke="none" d="M 19304,4572 C 22040,4572 24130,6387 24130,8763 24130,11139 22040,12954 19304,12954 16568,12954 14478,11139 14478,8763 14478,6387 16568,4572 19304,4572 Z M 14478,4572 L 14478,4572 Z M 24131,12955 L 24131,12955 Z"/>
+    <path fill="none" stroke="rgb(52,101,164)" d="M 19304,4572 C 22040,4572 24130,6387 24130,8763 24130,11139 22040,12954 19304,12954 16568,12954 14478,11139 14478,8763 14478,6387 16568,4572 19304,4572 Z"/>
+    <path fill="none" stroke="rgb(52,101,164)" d="M 14478,4572 L 14478,4572 Z"/>
+    <path fill="none" stroke="rgb(52,101,164)" d="M 24131,12955 L 24131,12955 Z"/>
    </g>
   </g>
  </g>
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index b03c79b49..a44480b98 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -2762,6 +2762,8 @@ void HTTPWSTest::testRenderShapeSelectionImpress()
         if (it != responseSVG.end())
             responseSVG.erase(responseSVG.begin(), ++it);
 
+        stripDescriptions(responseSVG);
+
         CPPUNIT_ASSERT(svgMatch(testname, responseSVG, "shapes_impress.svg"));
     }
     catch (const Poco::Exception& exc)