Change visual tests directory structure.

tests/visual_tests/clean.sh

@@ -1,3 +1,3 @@
-rm -f *-agg.png
+rm -f images/*-agg.png
-rm -f *-out.xml
+rm -f xml_output/*-out.xml
 

tests/visual_tests/styles/expressionformat.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/formating-1.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/formating-2.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/formating-3.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/formating-4.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/formating.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/jalign-auto.xml

@@ -6,7 +6,7 @@
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">shape</Parameter>
-            <Parameter name="file">points.shp</Parameter>
+            <Parameter name="file">../data/points.shp</Parameter>
         </Datasource>
     </Layer>
 

tests/visual_tests/styles/lines-1.xml

@@ -6,7 +6,7 @@
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
-            <Parameter name="file">lines.osm</Parameter>
+            <Parameter name="file">../data/lines.osm</Parameter>
         </Datasource>
     </Layer>
 

tests/visual_tests/styles/lines-2.xml

@@ -6,7 +6,7 @@
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
-            <Parameter name="file">lines.osm</Parameter>
+            <Parameter name="file">../data/lines.osm</Parameter>
         </Datasource>
     </Layer>
 

tests/visual_tests/styles/lines-3.xml

@@ -6,7 +6,7 @@
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
-            <Parameter name="file">lines.osm</Parameter>
+            <Parameter name="file">../data/lines.osm</Parameter>
         </Datasource>
     </Layer>
 

tests/visual_tests/styles/lines-shield.xml

@@ -6,14 +6,14 @@
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">osm</Parameter>
-            <Parameter name="file">lines.osm</Parameter>
+            <Parameter name="file">../data/lines.osm</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
             <LineSymbolizer stroke-width="1" stroke="blue"/>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="line" file="../data/svg/crosshair16x16.svg" spacing="30">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="line" file="../../data/svg/crosshair16x16.svg" spacing="30">'X'</ShieldSymbolizer>
         </Rule>
     </Style>
 

tests/visual_tests/styles/list.xml

@@ -7,9 +7,9 @@
     <Datasource>
 	<!--
       <Parameter name="type">osm</Parameter>
-      <Parameter name="file">points.osm</Parameter>-->
+      <Parameter name="file">../data/points.osm</Parameter>-->
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/rtl-point.xml

@@ -10,7 +10,7 @@
                 <Parameter name="file">points.osm</Parameter>
             -->
             <Parameter name="type">shape</Parameter>
-            <Parameter name="file">points.shp</Parameter>
+            <Parameter name="file">../data/points.shp</Parameter>
         </Datasource>
     </Layer>
 

tests/visual_tests/styles/shieldsymbolizer-1.xml

@@ -6,53 +6,53 @@
         <StyleName>My Style</StyleName>
         <Datasource>
             <Parameter name="type">shape</Parameter>
-            <Parameter name="file">points.shp</Parameter>
+            <Parameter name="file">../../data/points.shp</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
             <Filter>[nr] = '1'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '2'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '3'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '4'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg"  dy="0" vertical-alignment="bottom">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg"  dy="0" vertical-alignment="bottom">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '5'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '6'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '7'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '8'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg">'X&#10;X&#10;X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'X&#10;X&#10;X'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '9'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/svg/crosshair16x16.svg">'XXX'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'XXX'</ShieldSymbolizer>
         </Rule>
         <Rule>
             <Filter>[nr] = '10'</Filter>
-            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../data/images/crosshair16x16.png">'X'</ShieldSymbolizer>
+            <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <PointSymbolizer allow-overlap="true" file="../data/raster/white-alpha.png"/>
+            <PointSymbolizer allow-overlap="true" file="../../data/raster/white-alpha.png"/>
         </Rule>
 </Style>
 

tests/visual_tests/styles/simple-E.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/simple-N.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/simple-NE.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/simple-NW.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/simple-S.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/simple-SE.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/simple-SW.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/simple-W.xml

@@ -6,7 +6,7 @@
     <StyleName>My Style</StyleName>
     <Datasource>
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/styles/simple.xml

@@ -5,12 +5,8 @@
   <Layer name="layer" srs="+proj=latlong +datum=WGS84">
     <StyleName>My Style</StyleName>
     <Datasource>
-<!--
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">points.osm</Parameter>
-      -->
       <Parameter name="type">shape</Parameter>
-      <Parameter name="file">points.shp</Parameter>
+      <Parameter name="file">../data/points.shp</Parameter>
     </Datasource>
   </Layer>
 

tests/visual_tests/test.py

@@ -39,10 +39,10 @@ def render(filename, width, height=100):
     width = int(width)
     height = int(height)
     m = mapnik.Map(width, height)
-    mapnik.load_map(m, os.path.join(dirname, "%s.xml" % filename), False)
+    mapnik.load_map(m, os.path.join(dirname, "styles", "%s.xml" % filename), False)
     bbox = mapnik.Box2d(-0.05, -0.01, 0.95, 0.01)
     m.zoom_to_box(bbox)
-    basefn = os.path.join(dirname,'%s-%d' % (filename, width))
+    basefn = os.path.join(dirname, "images", '%s-%d' % (filename, width))
     mapnik.render_to_file(m, basefn+'-agg.png')
     diff = compare(basefn + '-agg.png', basefn + '-reference.png')
     if diff > 0:
@@ -63,6 +63,6 @@ for f in files:
             m = render(f[0], width[0], width[1])
         else:
             m = render(f[0], width)
-    mapnik.save_map(m, os.path.join(dirname,"%s-out.xml" % f[0]))
+    mapnik.save_map(m, os.path.join(dirname, 'xml_output', "%s-out.xml" % f[0]))
 
 summary()

tests/visual_tests/test_python.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 import mapnik
 import sys
+import os.path
+import compare
 
 class MyText(mapnik.FormattingNode):
     def __init__(self):
@@ -67,7 +69,7 @@ m.append_style('Style', style)
 
 
 layer = mapnik.Layer('Layer')
-layer.datasource = mapnik.Shapefile(file="points.shp")
+layer.datasource = mapnik.Shapefile(file="data/points.shp")
 layer.styles.append('Style')
 m.layers.append(layer)
 
@@ -95,4 +97,4 @@ format_trees = [
 
 for format_tree in format_trees:
     text.placements.defaults.format_tree = format_tree[1]
-    mapnik.render_to_file(m, 'python-%s.png' % format_tree[0], 'png')
+    mapnik.render_to_file(m, os.path.join("images", 'python-%s.png' % format_tree[0]), 'png')