GNOME.org
 

[librsvg] Add struct-use-04-b.svg from the SVG 1.1 test suite

commit 4ec908b71f9f19d0d37c98879188a72308c00433
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Mar 23 15:18:27 2017 -0600

    Add struct-use-04-b.svg from the SVG 1.1 test suite
    
    This file modified to look for includes in the "resources" subdirectory.
    
    Also, rename the "images" directory to "resources", and modify
    rsvg-test.c to ignore that directory as well.  This is because
    struct-use-04-b.svg includes another SVG file inside resources/, and if
    that directory weren't ignored, rsvg-test would look inside it for SVG
    files to try rendering as tests.

 .../svg1.1/{images => resources}/20x20.png         |  Bin 1038 -> 1038 bytes
 .../{images => resources}/struct-symbol-01.png     |  Bin 71497 -> 71497 bytes
 .../fixtures/reftests/svg1.1/resources/svgRef4.css |    4 +
 .../fixtures/reftests/svg1.1/resources/svgRef4.svg |   41 ++++++++++++
 .../reftests/svg1.1/struct-symbol-01-b.svg         |    2 +-
 tests/fixtures/reftests/svg1.1/struct-use-01-t.svg |    2 +-
 .../reftests/svg1.1/struct-use-04-b-ref.png        |  Bin 0 -> 19927 bytes
 tests/fixtures/reftests/svg1.1/struct-use-04-b.svg |   65 ++++++++++++++++++++
 tests/rsvg-test.c                                  |    2 +-
 9 files changed, 113 insertions(+), 3 deletions(-)
---
diff --git a/tests/fixtures/reftests/svg1.1/resources/svgRef4.css 
b/tests/fixtures/reftests/svg1.1/resources/svgRef4.css
new file mode 100644
index 0000000..0e4157b
--- /dev/null
+++ b/tests/fixtures/reftests/svg1.1/resources/svgRef4.css
@@ -0,0 +1,4 @@
+rect     {fill:fuchsia;}
+circle   {fill:blue;}
+polygon  {fill:green;}
+ellipse  {fill:gold;}
diff --git a/tests/fixtures/reftests/svg1.1/resources/svgRef4.svg 
b/tests/fixtures/reftests/svg1.1/resources/svgRef4.svg
new file mode 100644
index 0000000..2f170fb
--- /dev/null
+++ b/tests/fixtures/reftests/svg1.1/resources/svgRef4.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml-stylesheet type="text/css" href="svgRef4.css" ?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";>
+<svg id="svg-root" width="100%" height="100%" viewBox="0 0 480 360" 
+xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";  >
+
+  <SVGTestCase xmlns="http://www.w3.org/2000/02/svg/testsuite/description/"; >
+    <OperatorScript version="$Revision: 1.2 $" testname="" >
+      <Paragraph>
+      </Paragraph>
+    </OperatorScript>
+  </SVGTestCase>
+
+  <title id="test-title" > </title>
+  <desc id="test-desc" > </desc>
+
+  <!--======================================================================-->
+  <!--Content of Test Case follows...                  =====================-->
+  <!--======================================================================-->
+  <defs>
+    <style type="text/css">
+      <![CDATA[
+        *        {stroke:black; stroke-width:1;}
+        text     {stroke:none;}
+
+        #test-frame {fill:none;}
+      ]]>
+    </style>
+  </defs>
+
+  <g id="testContent" >
+    <rect id="alpha" x="100" y="50" width="120" height="120" />
+    <circle id="beta" cx="320" cy="110" r="60" />
+    <polygon id="gamma" points="260,180 380,190 360,300" />
+    <ellipse id="delta" cx="160" cy="240" ry="60" rx="45" />
+  </g>
+
+  <text font-size="35" x="240" y="35" text-anchor="middle" >svgRef4.svg</text>
+  <text id="revision" x="10" y="340" font-size="40" stroke="none" fill="black">$Revision: 1.2 $</text>
+  <rect id="test-frame" x="1" y="1" width="478" height="358" fill="none" stroke="#000000"/>
+</svg>
\ No newline at end of file
diff --git a/tests/fixtures/reftests/svg1.1/struct-symbol-01-b.svg 
b/tests/fixtures/reftests/svg1.1/struct-symbol-01-b.svg
index d4d3087..ff95a6a 100644
--- a/tests/fixtures/reftests/svg1.1/struct-symbol-01-b.svg
+++ b/tests/fixtures/reftests/svg1.1/struct-symbol-01-b.svg
@@ -60,7 +60,7 @@
   </defs>
   <g id="test-body-content" font-family="SVGFreeSansASCII,sans-serif" font-size="18">
     <symbol id="imageRef1" viewBox="0 0 1000 1000" preserveAspectRatio="none">
-      <image id="image1" x="0" y="0" width="1000" height="1000" xlink:href="images/struct-symbol-01.png"/>
+      <image id="image1" x="0" y="0" width="1000" height="1000" xlink:href="resources/struct-symbol-01.png"/>
     </symbol>
     <symbol id="largeRect">
       <rect x="0" y="0" width="1000" height="1000" fill="red"/>
diff --git a/tests/fixtures/reftests/svg1.1/struct-use-01-t.svg 
b/tests/fixtures/reftests/svg1.1/struct-use-01-t.svg
index a7818c9..e41a608 100644
--- a/tests/fixtures/reftests/svg1.1/struct-use-01-t.svg
+++ b/tests/fixtures/reftests/svg1.1/struct-use-01-t.svg
@@ -62,7 +62,7 @@
           <rect x="10" width="10" height="20" fill="rgb(0,128,0)"/>
         </g>
         <use id="usedUse" xlink:href="#usedRect"/>
-        <image id="usedImage" xlink:href="images/20x20.png" width="20" height="20"/>
+        <image id="usedImage" xlink:href="resources/20x20.png" width="20" height="20"/>
         <text id="usedText">Text</text>
       </g>
     </defs>
diff --git a/tests/fixtures/reftests/svg1.1/struct-use-04-b-ref.png 
b/tests/fixtures/reftests/svg1.1/struct-use-04-b-ref.png
new file mode 100644
index 0000000..7e42785
Binary files /dev/null and b/tests/fixtures/reftests/svg1.1/struct-use-04-b-ref.png differ
diff --git a/tests/fixtures/reftests/svg1.1/struct-use-04-b.svg 
b/tests/fixtures/reftests/svg1.1/struct-use-04-b.svg
new file mode 100644
index 0000000..fd76e7a
--- /dev/null
+++ b/tests/fixtures/reftests/svg1.1/struct-use-04-b.svg
@@ -0,0 +1,65 @@
+<svg version="1.1" baseProfile="basic" id="svg-root"
+  width="100%" height="100%" viewBox="0 0 480 360"
+  xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>
+  <!--======================================================================-->
+  <!--=  SVG 1.1 2nd Edition Test Case                                     =-->
+  <!--======================================================================-->
+  <!--=  Copyright 2009 World Wide Web Consortium, (Massachusetts          =-->
+  <!--=  Institute of Technology, European Research Consortium for         =-->
+  <!--=  Informatics and Mathematics (ERCIM), Keio University).            =-->
+  <!--=  All Rights Reserved.                                              =-->
+  <!--=  See http://www.w3.org/Consortium/Legal/.                          =-->
+  <!--======================================================================-->
+  <d:SVGTestCase xmlns:d="http://www.w3.org/2000/02/svg/testsuite/description/";
+    template-version="1.4" reviewer="CL" author="BB" status="accepted"
+    version="$Revision: 1.6 $" testname="$RCSfile: struct-use-04-b.svg,v $">
+    <d:testDescription xmlns="http://www.w3.org/1999/xhtml"; 
href="http://www.w3.org/TR/SVG11/struct.html#UseElement";>
+        <p>
+          The intent of the file is to determine if the UA supports references to external SVG fragments.
+        </p>
+    </d:testDescription>
+    <d:operatorScript xmlns="http://www.w3.org/1999/xhtml";>
+      <p>
+        See referenced image.
+      </p>
+    </d:operatorScript>
+    <d:passCriteria xmlns="http://www.w3.org/1999/xhtml";>
+      <p>
+        To pass this test, the UA agent must display a total of 8 graphical
+        primitives (2 rectangles, 2 circles, 2 ellipses and 2 triangles).
+        For each pair of objects, one is a semi-transparent duplicate
+        copy at the other displayed at an offset position..
+      </p>
+    </d:passCriteria>
+  </d:SVGTestCase>
+  <title id="test-title">$RCSfile: struct-use-04-b.svg,v $</title>
+  <defs>
+    <font-face font-family="SVGFreeSansASCII" unicode-range="U+0-7F">
+      <font-face-src>
+        <font-face-uri xlink:href="../resources/SVGFreeSans.svg#ascii"/>
+      </font-face-src>
+    </font-face>
+  </defs>
+  <g id="test-body-content" font-family="SVGFreeSansASCII,sans-serif" font-size="18">
+    <g id="ExtContent">
+      <use xlink:href="resources/svgRef4.svg#alpha"/>
+      <use xlink:href="resources/svgRef4.svg#beta"/>
+      <use xlink:href="resources/svgRef4.svg#gamma"/>
+      <use xlink:href="resources/svgRef4.svg#delta"/>
+
+      <use xlink:href="resources/svgRef4.svg#testContent" x="-5" y="5" fill-opacity="0.5"/>
+    </g>
+
+    <text font-size="20" x="240" y="30" text-anchor="middle">External references on &lt;use&gt;</text>
+  </g>
+  <g font-family="SVGFreeSansASCII,sans-serif" font-size="32">
+    <text id="revision" x="10" y="340" stroke="none" fill="black">$Revision: 1.6 $</text>
+  </g>
+  <rect id="test-frame" x="1" y="1" width="478" height="358" fill="none" stroke="#000000"/>
+  <!-- comment out this watermark once the test is approved
+  <g id="draft-watermark">
+    <rect x="1" y="1" width="478" height="20" fill="red" stroke="black" stroke-width="1"/>
+    <text font-family="SVGFreeSansASCII,sans-serif" font-weight="bold" font-size="20" x="240"
+      text-anchor="middle" y="18" stroke-width="0.5" stroke="black" fill="white">DRAFT</text>
+  </g>-->
+</svg>
diff --git a/tests/rsvg-test.c b/tests/rsvg-test.c
index 9af96db..f8f8ec9 100644
--- a/tests/rsvg-test.c
+++ b/tests/rsvg-test.c
@@ -180,7 +180,7 @@ is_svg_or_subdir (GFile *file)
     result = FALSE;
 
     basename = g_file_get_basename (file);
-    ignore = g_str_has_prefix (basename, "ignore");
+    ignore = g_str_has_prefix (basename, "ignore") || strcmp (basename, "resources") == 0;
 
     if (ignore)
        goto out;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]