Move SVG tests to runtest.c

Also update the test results for the first time since 2000.

Makefile.am

@@ -193,8 +193,6 @@ asan:
 	@echo '## rebuilding for ASAN'
 	./configure CFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" CXXFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined" CC="clang" CXX="clang++" --disable-shared ; OptimOff  ; $(MAKE) clean ; $(MAKE)
 
-testall : tests SVGtests
-
 tests: $(TEST_DEBUG) $(TEST_CATALOG) $(TEST_REGEXPS) $(TEST_SCHEMATRON) Timingtests $(TEST_VTIME) $(PYTHON_TESTS)
 	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
 	    $(MAKE) -s tests ; fi)
@@ -275,26 +273,6 @@ Catatests : xmlcatalog$(EXEEXT)
 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
 	rm -f $(srcdir)/result/catalogs/mycatalog)
 
-SVGtests : xmllint$(EXEEXT)
-	@echo "## SVG parsing regression tests"
-	-@(for i in $(srcdir)/test/SVG/* ; do \
-	  name=`basename $$i`; \
-	  if [ ! -d $$i ] ; then \
-	  if [ ! -f $(srcdir)/result/SVG/$$name ] ; then \
-	      echo New test file $$name ; \
-	      $(CHECKER) $(top_builddir)/xmllint $$i > $(srcdir)/result/SVG/$$name ; \
-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
-	  else \
-	      echo Testing $$name ; \
-	      $(CHECKER) $(top_builddir)/xmllint $$i > result.$$name ; \
-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
-	      diff $(srcdir)/result/SVG/$$name result.$$name ; \
-	      $(CHECKER) $(top_builddir)/xmllint result.$$name > result2.$$name ; \
-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
-	      diff result.$$name result2.$$name ; \
-	      rm result.$$name result2.$$name ; \
-	  fi ; fi ; done)
-
 Regexptests: testRegexp$(EXEEXT)
 	@(echo > .memdump)
 	@echo "## Regexp regression tests"

fuzz/Makefile.am

@@ -15,6 +15,7 @@ XML_SEED_CORPUS_SRC = \
     '$(top_srcdir)/test/errors/*.xml' \
     '$(top_srcdir)/test/errors10/*.xml' \
     '$(top_srcdir)/test/namespaces/*' \
+    '$(top_srcdir)/test/SVG/*.xml' \
     '$(top_srcdir)/test/valid/*.xml' \
     '$(top_srcdir)/test/VC/*' \
     '$(top_srcdir)/test/VCM/*' \

result/SVG/bike.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG April 1999//EN" "http://www.w3.org/Graphics/SVG/svg-19990412.dtd">
+<!--DOCTYPE svg SYSTEM "svg-19990412.dtd"-->
 <svg width="4in" height="3in">
   <title>Kona Lavadome mountain bike
   </title>
@@ -10,24 +11,19 @@
   </desc>
   <g id="bike">
     <defs>
-      <symbol id="spoke">
-        <desc>14/12 gauge double butted spoke</desc>
-<!-- the path data goes here -->
-      </symbol>
-      <symbol id="hub">
-        <desc>black anodised low torsion hub</desc>
-<!--the path data goes here -->
-      </symbol>
-      <symbol id="rim">
-        <desc>twin wall, eyeletted rim</desc>
-<!-- the path data goes here-->
-      </symbol>
-      <symbol id="cogs">
-        <desc>8 speed, wide ratio gearing</desc>
-<!--the path data goes here -->
-      </symbol>
-      <symbol id="lacing">
-        <desc>double cross lacing of 32 spokes</desc>
+     <symbol id="spoke"><desc>14/12 gauge double butted spoke</desc>
+     <!-- the path data goes here --></symbol>
+     
+     <symbol id="hub"><desc>black anodised low torsion hub</desc>
+     <!--the path data goes here --></symbol>
+     
+     <symbol id="rim"><desc>twin wall, eyeletted rim</desc>
+     <!-- the path data goes here--></symbol>
+     
+     <symbol id="cogs"><desc>8 speed, wide ratio gearing</desc>
+     <!--the path data goes here --></symbol>
+     
+     <symbol id="lacing"><desc>double cross lacing of 32 spokes</desc>
      </symbol>
     </defs>
     <!-- the overall bike drawing goes here -->
@@ -36,9 +32,9 @@
     <desc>The front wheel provides grip, steering and some shock absorption</desc>
     <use href="id(lacing)" style="rotation: 20deg; fillcolor: black"/>
     </g>
-    <g id="backwheel"/>
-    <g id="frame">
-<!-- and so on -->
+    <g id="backwheel">
+    </g>
+    <g id="frame"><!-- and so on -->
     </g>
   </g>
 </svg>

result/SVG/group03.xml

@@ -5,7 +5,8 @@
   </desc>
   <g>
      <g>
-      <g/>
+       <g>
+       </g>
      </g>
    </g>
 </svg>

result/SVG/image-wf.xml

@@ -2,7 +2,7 @@
 <svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="4in" height="3in">
   <desc>This links to an external image
   </desc>
-  <image xml:link="simple" x="200" y="200" style="width: 100px; height: 100px" show="embed" actuate="auto" href="myimage.png">
+  <image x="200" y="200" style="width: 100px; height: 100px" xml:link="simple" show="embed" actuate="auto" href="myimage.png">
     <title>My image</title>
   </image>
 </svg>

result/SVG/marker.xml

@@ -13,9 +13,11 @@
          beginning of the path -->
     <marker href="#Triangle" width="200" height="200" style="text-transform: rotate(180)"/>
     <data d="M 2000 2000"/>
+
     <!-- Turn off markers in the middle of the path -->
     <marker href=""/>
     <data d="L 4000 2000 L 4000 4000"/>
+
     <!-- Place an arrowhead at the end of the path-->
     <marker href="#Triangle" width="200" height="200"/>
     <data d="L 6000 4000"/>

result/SVG/mathswitch.xml

@@ -7,12 +7,14 @@
   <!-- The <switch> element will process the first child element
        whose testing attributes evaluate to true.-->
   <switch>
+
     <!-- Process the MathML if the system-required attribute
          evaluates to true (i.e., the user agent supports MathML
          embedded within SVG). -->
     <foreignobject system-required="http://www.w3.org/TR/REC-MathML-19980407" width="100" height="50">
       <!-- MathML content goes here -->
     </foreignobject>
+
     <!-- Else, process the following alternate SVG.
          Note that there are no testing attributes on the <g> element.
          If no testing attributes are provided, it is as if there
@@ -22,5 +24,6 @@
       <rect style="fill: red"/>
       <text>Formula goes here</text>
     </g>
+
   </switch>
 </svg>

result/SVG/script.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG April 1999//EN" "http://www.w3.org/Graphics/SVG/svg-19990412.dtd">
 <svg width="4in" height="3in">
   <defs>
-    <script>
-<![CDATA[
+    <script><![CDATA[
       /* Beep on mouseclick */
       MouseClickHandler() { beep(); }
      ]]>

result/SVG/style.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG April 1999//EN" "http://www.w3.org/Graphics/SVG/svg-19990412.dtd">
 <svg width="4in" height="3in">
   <defs>
-    <style>
-<![CDATA[
+    <style><![CDATA[
       .TitleText { font-size: 16; font-family: Helvetica } ]]>
     </style>
   </defs>

result/SVG/switch.xml

@@ -5,10 +5,12 @@
          first child element which tests true and skip
          past all others. -->
     <switch>
+
       <!-- The system-required attribute tests to see if
            the user agent supports SVG. If true, then
            render the file drawing.svg. -->
       <ref system-required="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" type="image/svg" src="drawing.svg"/>
+
       <!-- Else, render the alternate image. -->
       <img src="alternate_image.jpg"/>
     </switch>

result/SVG/symbol-use.xml

@@ -6,17 +6,22 @@
       <!-- symbol definition here -->
     </symbol>
   </defs>
+
   <desc>Examples of inline and referenced content
   </desc>
+  
   <!-- <g> with inline content -->
   <g>
     <!-- Inline content goes here -->
   </g>
+
   <!-- referenced content -->
   <use href="#TemplateObject01"/>
+
   <!-- <g> with both referenced and inline content -->
   <g>
     <use href="#TemplateObject01"/>
     <!-- Inline content goes here -->
   </g>
+
 </svg>

result/SVG/text02.xml

@@ -10,16 +10,7 @@
       <t href="#T4"/>
     </textflow>
   </defs>
-  <text x="100" y="100" id="T1">
-    <tf href="#TF1">123</tf>
-  </text>
-  <text x="100" y="200" id="T2">
-    <tf href="#TF2">ABC</tf>
-  </text>
-  <text x="150" y="100" id="T3">
-    <tf href="#TF1">456</tf>
-  </text>
-  <text x="150" y="200" id="T4">
-    <tf href="#TF2">DEF</tf>
-  </text>
-</svg>
+  <text x="100" y="100" id="T1"><tf href="#TF1">123</tf></text>
+  <text x="100" y="200" id="T2"><tf href="#TF2">ABC</tf></text>
+  <text x="150" y="100" id="T3"><tf href="#TF1">456</tf></text>
+  <text x="150" y="200" id="T4"><tf href="#TF2">DEF</tf></text></svg>

result/SVG/toap02.xml

@@ -9,8 +9,10 @@
       <path d="M 50 0 L 250 200 L 250 0 z"/>
     </symbol>
   </defs>
+  
   <desc>General graphics on a path
   </desc>
+  
   <text>
     <textpath href="#MyPath"/>
     <use href="#Triangle1"/>
@@ -24,4 +26,5 @@
     <use href="#Triangle1"/>
     <use href="#Triangle2"/>
   </text>
+
 </svg>

result/SVG/transform.xml

@@ -7,14 +7,19 @@
         font height of 12 pixels -->
    <text style="font-size: 12">This prints 12 pixels high.</text>
    <text style="font-size: 12px">This prints 12 pixels high.</text>
+
    <!-- Now scale the coordinate system by 2. -->
    <g style="transform: scale(2)">
+
       <!-- The following text will actually draw 24 pixels high
            because each unit in the new coordinate system equals
            2 units in the previous coordinate system. -->
       <text style="font-size: 12">This prints 24 pixels high.</text>
+
       <!-- The following text will actually still draw 12 pixels high
            because the CSS unit specifier has been provided. -->
       <text style="font-size: 12px">This prints 12 pixels high.</text>
+
    </g>
+
 </svg>

result/SVG/v-template.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG April 1999//EN" "http://www.w3.org/Graphics/SVG/svg-19990412.dtd">
 <svg width="4in" height="3in">
-  <desc/>
-  <g/>
+  <desc>
+  </desc>
+  <g>
+  </g>
 </svg>

result/SVG/viewport-transform.xml

@@ -7,21 +7,27 @@
         font height of 12 pixels -->
    <text style="font-size: 12">This prints 12 pixels high.</text>
    <text style="font-size: 12px">This prints 12 pixels high.</text>
+
    <!-- Now scale the coordinate system by 2. -->
    <g style="transform: scale(2)">
+
       <!-- The following text will actually draw 24 pixels high
            because each unit in the new coordinate system equals
            2 units in the previous coordinate system. -->
       <text style="font-size: 12">This prints 24 pixels high.</text>
+
       <!-- The following text will actually still draw 12 pixels high
            because the CSS unit specifier has been provided. -->
       <text style="font-size: 12px">This prints 12 pixels high.</text>
    </g>
+
    <!-- This time, scale the coordinate system by 3. -->
    <g style="transform: scale(3)">
+
       <!-- Establish a new viewport and thus change the meaning of
            some CSS unit specifiers. -->
       <svg style="left:0; top:0; right:100; bottom:100" width="100%" height="100%">
+
          <!-- The following two text elements will both draw with a 
               font height of 36 screen pixels. The first text element
               defines its height in user coordinates, which have been
@@ -31,6 +37,8 @@
               a new viewport. -->
          <text style="font-size: 12">This prints 36 pixels high.</text>
          <text style="font-size: 12px">This prints 36 pixels high.</text>
+
       </svg>
    </g>
+
 </svg>

result/SVG/viewport.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" standalone="yes"?>
 <parent xmlns="http://some.url">
+   
    <!-- SVG graphic -->
    <svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="100px" height="200px">
       <path d="M100,100 Q200,400,300,100"/>
       <!-- rest of SVG graphic would go here -->
    </svg>   
+   
 </parent>

result/SVG/wf-template.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" standalone="yes"?>
 <svg xmlns="http://www.w3.org/Graphics/SVG/svg-19990412.dtd" width="4in" height="3in">
-  <desc/>
+  <desc>
+  </desc>
+
 </svg>

runtest.c

@@ -4491,6 +4491,9 @@ testDesc testDescriptions[] = {
       threadsTest, NULL, NULL, NULL, NULL,
       0 },
 #endif
+    { "SVG parsing regression tests" ,
+      oldParseTest, "./test/SVG/*.xml", "result/SVG/", "", NULL,
+      0 },
     {NULL, NULL, NULL, NULL, NULL, NULL, 0}
 };