diff --git a/tests/visual_tests/clean.sh b/tests/visual_tests/clean.sh index ba31ecae5..1278159f4 100755 --- a/tests/visual_tests/clean.sh +++ b/tests/visual_tests/clean.sh @@ -1,3 +1,3 @@ -rm -f *-agg.png -rm -f *-out.xml +rm -f images/*-agg.png +rm -f xml_output/*-out.xml diff --git a/tests/visual_tests/lines.osm b/tests/visual_tests/data/lines.osm similarity index 100% rename from tests/visual_tests/lines.osm rename to tests/visual_tests/data/lines.osm diff --git a/tests/visual_tests/points.dbf b/tests/visual_tests/data/points.dbf similarity index 100% rename from tests/visual_tests/points.dbf rename to tests/visual_tests/data/points.dbf diff --git a/tests/visual_tests/points.osm b/tests/visual_tests/data/points.osm similarity index 100% rename from tests/visual_tests/points.osm rename to tests/visual_tests/data/points.osm diff --git a/tests/visual_tests/points.shp b/tests/visual_tests/data/points.shp similarity index 100% rename from tests/visual_tests/points.shp rename to tests/visual_tests/data/points.shp diff --git a/tests/visual_tests/expressionformat-500-reference.png b/tests/visual_tests/images/expressionformat-500-reference.png similarity index 100% rename from tests/visual_tests/expressionformat-500-reference.png rename to tests/visual_tests/images/expressionformat-500-reference.png diff --git a/tests/visual_tests/formating-1-500-reference.png b/tests/visual_tests/images/formating-1-500-reference.png similarity index 100% rename from tests/visual_tests/formating-1-500-reference.png rename to tests/visual_tests/images/formating-1-500-reference.png diff --git a/tests/visual_tests/formating-2-500-reference.png b/tests/visual_tests/images/formating-2-500-reference.png similarity index 100% rename from tests/visual_tests/formating-2-500-reference.png rename to tests/visual_tests/images/formating-2-500-reference.png diff --git a/tests/visual_tests/formating-3-500-reference.png b/tests/visual_tests/images/formating-3-500-reference.png similarity index 100% rename from tests/visual_tests/formating-3-500-reference.png rename to tests/visual_tests/images/formating-3-500-reference.png diff --git a/tests/visual_tests/formating-4-500-reference.png b/tests/visual_tests/images/formating-4-500-reference.png similarity index 100% rename from tests/visual_tests/formating-4-500-reference.png rename to tests/visual_tests/images/formating-4-500-reference.png diff --git a/tests/visual_tests/formating-500-reference.png b/tests/visual_tests/images/formating-500-reference.png similarity index 100% rename from tests/visual_tests/formating-500-reference.png rename to tests/visual_tests/images/formating-500-reference.png diff --git a/tests/visual_tests/jalign-auto-200-reference.png b/tests/visual_tests/images/jalign-auto-200-reference.png similarity index 100% rename from tests/visual_tests/jalign-auto-200-reference.png rename to tests/visual_tests/images/jalign-auto-200-reference.png diff --git a/tests/visual_tests/lines-1-200-reference.png b/tests/visual_tests/images/lines-1-200-reference.png similarity index 100% rename from tests/visual_tests/lines-1-200-reference.png rename to tests/visual_tests/images/lines-1-200-reference.png diff --git a/tests/visual_tests/lines-1-400-reference.png b/tests/visual_tests/images/lines-1-400-reference.png similarity index 100% rename from tests/visual_tests/lines-1-400-reference.png rename to tests/visual_tests/images/lines-1-400-reference.png diff --git a/tests/visual_tests/lines-1-600-reference.png b/tests/visual_tests/images/lines-1-600-reference.png similarity index 100% rename from tests/visual_tests/lines-1-600-reference.png rename to tests/visual_tests/images/lines-1-600-reference.png diff --git a/tests/visual_tests/lines-1-800-reference.png b/tests/visual_tests/images/lines-1-800-reference.png similarity index 100% rename from tests/visual_tests/lines-1-800-reference.png rename to tests/visual_tests/images/lines-1-800-reference.png diff --git a/tests/visual_tests/lines-2-200-reference.png b/tests/visual_tests/images/lines-2-200-reference.png similarity index 100% rename from tests/visual_tests/lines-2-200-reference.png rename to tests/visual_tests/images/lines-2-200-reference.png diff --git a/tests/visual_tests/lines-2-400-reference.png b/tests/visual_tests/images/lines-2-400-reference.png similarity index 100% rename from tests/visual_tests/lines-2-400-reference.png rename to tests/visual_tests/images/lines-2-400-reference.png diff --git a/tests/visual_tests/lines-2-600-reference.png b/tests/visual_tests/images/lines-2-600-reference.png similarity index 100% rename from tests/visual_tests/lines-2-600-reference.png rename to tests/visual_tests/images/lines-2-600-reference.png diff --git a/tests/visual_tests/lines-2-800-reference.png b/tests/visual_tests/images/lines-2-800-reference.png similarity index 100% rename from tests/visual_tests/lines-2-800-reference.png rename to tests/visual_tests/images/lines-2-800-reference.png diff --git a/tests/visual_tests/lines-3-200-reference.png b/tests/visual_tests/images/lines-3-200-reference.png similarity index 100% rename from tests/visual_tests/lines-3-200-reference.png rename to tests/visual_tests/images/lines-3-200-reference.png diff --git a/tests/visual_tests/lines-3-400-reference.png b/tests/visual_tests/images/lines-3-400-reference.png similarity index 100% rename from tests/visual_tests/lines-3-400-reference.png rename to tests/visual_tests/images/lines-3-400-reference.png diff --git a/tests/visual_tests/lines-3-600-reference.png b/tests/visual_tests/images/lines-3-600-reference.png similarity index 100% rename from tests/visual_tests/lines-3-600-reference.png rename to tests/visual_tests/images/lines-3-600-reference.png diff --git a/tests/visual_tests/lines-3-800-reference.png b/tests/visual_tests/images/lines-3-800-reference.png similarity index 100% rename from tests/visual_tests/lines-3-800-reference.png rename to tests/visual_tests/images/lines-3-800-reference.png diff --git a/tests/visual_tests/lines-shield-200-reference.png b/tests/visual_tests/images/lines-shield-200-reference.png similarity index 100% rename from tests/visual_tests/lines-shield-200-reference.png rename to tests/visual_tests/images/lines-shield-200-reference.png diff --git a/tests/visual_tests/lines-shield-400-reference.png b/tests/visual_tests/images/lines-shield-400-reference.png similarity index 100% rename from tests/visual_tests/lines-shield-400-reference.png rename to tests/visual_tests/images/lines-shield-400-reference.png diff --git a/tests/visual_tests/lines-shield-600-reference.png b/tests/visual_tests/images/lines-shield-600-reference.png similarity index 100% rename from tests/visual_tests/lines-shield-600-reference.png rename to tests/visual_tests/images/lines-shield-600-reference.png diff --git a/tests/visual_tests/lines-shield-800-reference.png b/tests/visual_tests/images/lines-shield-800-reference.png similarity index 100% rename from tests/visual_tests/lines-shield-800-reference.png rename to tests/visual_tests/images/lines-shield-800-reference.png diff --git a/tests/visual_tests/list-100-reference.png b/tests/visual_tests/images/list-100-reference.png similarity index 100% rename from tests/visual_tests/list-100-reference.png rename to tests/visual_tests/images/list-100-reference.png diff --git a/tests/visual_tests/list-150-reference.png b/tests/visual_tests/images/list-150-reference.png similarity index 100% rename from tests/visual_tests/list-150-reference.png rename to tests/visual_tests/images/list-150-reference.png diff --git a/tests/visual_tests/list-200-reference.png b/tests/visual_tests/images/list-200-reference.png similarity index 100% rename from tests/visual_tests/list-200-reference.png rename to tests/visual_tests/images/list-200-reference.png diff --git a/tests/visual_tests/list-250-reference.png b/tests/visual_tests/images/list-250-reference.png similarity index 100% rename from tests/visual_tests/list-250-reference.png rename to tests/visual_tests/images/list-250-reference.png diff --git a/tests/visual_tests/list-300-reference.png b/tests/visual_tests/images/list-300-reference.png similarity index 100% rename from tests/visual_tests/list-300-reference.png rename to tests/visual_tests/images/list-300-reference.png diff --git a/tests/visual_tests/list-400-reference.png b/tests/visual_tests/images/list-400-reference.png similarity index 100% rename from tests/visual_tests/list-400-reference.png rename to tests/visual_tests/images/list-400-reference.png diff --git a/tests/visual_tests/list-600-reference.png b/tests/visual_tests/images/list-600-reference.png similarity index 100% rename from tests/visual_tests/list-600-reference.png rename to tests/visual_tests/images/list-600-reference.png diff --git a/tests/visual_tests/list-800-reference.png b/tests/visual_tests/images/list-800-reference.png similarity index 100% rename from tests/visual_tests/list-800-reference.png rename to tests/visual_tests/images/list-800-reference.png diff --git a/tests/visual_tests/python-IfElse-reference.png b/tests/visual_tests/images/python-IfElse-reference.png similarity index 100% rename from tests/visual_tests/python-IfElse-reference.png rename to tests/visual_tests/images/python-IfElse-reference.png diff --git a/tests/visual_tests/python-MyText-reference.png b/tests/visual_tests/images/python-MyText-reference.png similarity index 100% rename from tests/visual_tests/python-MyText-reference.png rename to tests/visual_tests/images/python-MyText-reference.png diff --git a/tests/visual_tests/python-TextNode-reference.png b/tests/visual_tests/images/python-TextNode-reference.png similarity index 100% rename from tests/visual_tests/python-TextNode-reference.png rename to tests/visual_tests/images/python-TextNode-reference.png diff --git a/tests/visual_tests/rtl-point-200-reference.png b/tests/visual_tests/images/rtl-point-200-reference.png similarity index 100% rename from tests/visual_tests/rtl-point-200-reference.png rename to tests/visual_tests/images/rtl-point-200-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-490-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-490-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-490-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-490-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-495-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-495-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-495-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-495-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-497-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-497-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-497-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-497-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-498-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-498-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-498-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-498-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-499-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-499-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-499-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-499-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-500-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-500-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-500-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-500-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-501-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-501-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-501-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-501-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-502-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-502-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-502-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-502-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-505-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-505-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-505-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-505-reference.png diff --git a/tests/visual_tests/shieldsymbolizer-1-510-reference.png b/tests/visual_tests/images/shieldsymbolizer-1-510-reference.png similarity index 100% rename from tests/visual_tests/shieldsymbolizer-1-510-reference.png rename to tests/visual_tests/images/shieldsymbolizer-1-510-reference.png diff --git a/tests/visual_tests/simple-100-reference.png b/tests/visual_tests/images/simple-100-reference.png similarity index 100% rename from tests/visual_tests/simple-100-reference.png rename to tests/visual_tests/images/simple-100-reference.png diff --git a/tests/visual_tests/simple-150-reference.png b/tests/visual_tests/images/simple-150-reference.png similarity index 100% rename from tests/visual_tests/simple-150-reference.png rename to tests/visual_tests/images/simple-150-reference.png diff --git a/tests/visual_tests/simple-200-reference.png b/tests/visual_tests/images/simple-200-reference.png similarity index 100% rename from tests/visual_tests/simple-200-reference.png rename to tests/visual_tests/images/simple-200-reference.png diff --git a/tests/visual_tests/simple-250-reference.png b/tests/visual_tests/images/simple-250-reference.png similarity index 100% rename from tests/visual_tests/simple-250-reference.png rename to tests/visual_tests/images/simple-250-reference.png diff --git a/tests/visual_tests/simple-300-reference.png b/tests/visual_tests/images/simple-300-reference.png similarity index 100% rename from tests/visual_tests/simple-300-reference.png rename to tests/visual_tests/images/simple-300-reference.png diff --git a/tests/visual_tests/simple-400-reference.png b/tests/visual_tests/images/simple-400-reference.png similarity index 100% rename from tests/visual_tests/simple-400-reference.png rename to tests/visual_tests/images/simple-400-reference.png diff --git a/tests/visual_tests/simple-600-reference.png b/tests/visual_tests/images/simple-600-reference.png similarity index 100% rename from tests/visual_tests/simple-600-reference.png rename to tests/visual_tests/images/simple-600-reference.png diff --git a/tests/visual_tests/simple-800-reference.png b/tests/visual_tests/images/simple-800-reference.png similarity index 100% rename from tests/visual_tests/simple-800-reference.png rename to tests/visual_tests/images/simple-800-reference.png diff --git a/tests/visual_tests/simple-E-500-reference.png b/tests/visual_tests/images/simple-E-500-reference.png similarity index 100% rename from tests/visual_tests/simple-E-500-reference.png rename to tests/visual_tests/images/simple-E-500-reference.png diff --git a/tests/visual_tests/simple-N-500-reference.png b/tests/visual_tests/images/simple-N-500-reference.png similarity index 100% rename from tests/visual_tests/simple-N-500-reference.png rename to tests/visual_tests/images/simple-N-500-reference.png diff --git a/tests/visual_tests/simple-NE-500-reference.png b/tests/visual_tests/images/simple-NE-500-reference.png similarity index 100% rename from tests/visual_tests/simple-NE-500-reference.png rename to tests/visual_tests/images/simple-NE-500-reference.png diff --git a/tests/visual_tests/simple-NW-500-reference.png b/tests/visual_tests/images/simple-NW-500-reference.png similarity index 100% rename from tests/visual_tests/simple-NW-500-reference.png rename to tests/visual_tests/images/simple-NW-500-reference.png diff --git a/tests/visual_tests/simple-S-500-reference.png b/tests/visual_tests/images/simple-S-500-reference.png similarity index 100% rename from tests/visual_tests/simple-S-500-reference.png rename to tests/visual_tests/images/simple-S-500-reference.png diff --git a/tests/visual_tests/simple-SE-500-reference.png b/tests/visual_tests/images/simple-SE-500-reference.png similarity index 100% rename from tests/visual_tests/simple-SE-500-reference.png rename to tests/visual_tests/images/simple-SE-500-reference.png diff --git a/tests/visual_tests/simple-SW-500-reference.png b/tests/visual_tests/images/simple-SW-500-reference.png similarity index 100% rename from tests/visual_tests/simple-SW-500-reference.png rename to tests/visual_tests/images/simple-SW-500-reference.png diff --git a/tests/visual_tests/simple-W-500-reference.png b/tests/visual_tests/images/simple-W-500-reference.png similarity index 100% rename from tests/visual_tests/simple-W-500-reference.png rename to tests/visual_tests/images/simple-W-500-reference.png diff --git a/tests/visual_tests/expressionformat.xml b/tests/visual_tests/styles/expressionformat.xml similarity index 90% rename from tests/visual_tests/expressionformat.xml rename to tests/visual_tests/styles/expressionformat.xml index 3c7b74b03..5c66ab54c 100644 --- a/tests/visual_tests/expressionformat.xml +++ b/tests/visual_tests/styles/expressionformat.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/formating-1.xml b/tests/visual_tests/styles/formating-1.xml similarity index 91% rename from tests/visual_tests/formating-1.xml rename to tests/visual_tests/styles/formating-1.xml index 75158e8b5..a044f662c 100644 --- a/tests/visual_tests/formating-1.xml +++ b/tests/visual_tests/styles/formating-1.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/formating-2.xml b/tests/visual_tests/styles/formating-2.xml similarity index 91% rename from tests/visual_tests/formating-2.xml rename to tests/visual_tests/styles/formating-2.xml index 4fda094db..285646515 100644 --- a/tests/visual_tests/formating-2.xml +++ b/tests/visual_tests/styles/formating-2.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/formating-3.xml b/tests/visual_tests/styles/formating-3.xml similarity index 91% rename from tests/visual_tests/formating-3.xml rename to tests/visual_tests/styles/formating-3.xml index 1e1bbd048..159ef880c 100644 --- a/tests/visual_tests/formating-3.xml +++ b/tests/visual_tests/styles/formating-3.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/formating-4.xml b/tests/visual_tests/styles/formating-4.xml similarity index 89% rename from tests/visual_tests/formating-4.xml rename to tests/visual_tests/styles/formating-4.xml index 746f38d02..551cd09d5 100644 --- a/tests/visual_tests/formating-4.xml +++ b/tests/visual_tests/styles/formating-4.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/formating.xml b/tests/visual_tests/styles/formating.xml similarity index 91% rename from tests/visual_tests/formating.xml rename to tests/visual_tests/styles/formating.xml index d59c7b8da..acef45dd7 100644 --- a/tests/visual_tests/formating.xml +++ b/tests/visual_tests/styles/formating.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/jalign-auto.xml b/tests/visual_tests/styles/jalign-auto.xml similarity index 96% rename from tests/visual_tests/jalign-auto.xml rename to tests/visual_tests/styles/jalign-auto.xml index d3c8631f0..8956751e5 100644 --- a/tests/visual_tests/jalign-auto.xml +++ b/tests/visual_tests/styles/jalign-auto.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/lines-1.xml b/tests/visual_tests/styles/lines-1.xml similarity index 89% rename from tests/visual_tests/lines-1.xml rename to tests/visual_tests/styles/lines-1.xml index 7df2294c7..5b8fe6a58 100644 --- a/tests/visual_tests/lines-1.xml +++ b/tests/visual_tests/styles/lines-1.xml @@ -6,7 +6,7 @@ My Style osm - lines.osm + ../data/lines.osm diff --git a/tests/visual_tests/lines-2.xml b/tests/visual_tests/styles/lines-2.xml similarity index 90% rename from tests/visual_tests/lines-2.xml rename to tests/visual_tests/styles/lines-2.xml index 1c77a3115..9b32abb73 100644 --- a/tests/visual_tests/lines-2.xml +++ b/tests/visual_tests/styles/lines-2.xml @@ -6,7 +6,7 @@ My Style osm - lines.osm + ../data/lines.osm diff --git a/tests/visual_tests/lines-3.xml b/tests/visual_tests/styles/lines-3.xml similarity index 90% rename from tests/visual_tests/lines-3.xml rename to tests/visual_tests/styles/lines-3.xml index ef37dc51c..13f5cc332 100644 --- a/tests/visual_tests/lines-3.xml +++ b/tests/visual_tests/styles/lines-3.xml @@ -6,7 +6,7 @@ My Style osm - lines.osm + ../data/lines.osm diff --git a/tests/visual_tests/lines-shield.xml b/tests/visual_tests/styles/lines-shield.xml similarity index 76% rename from tests/visual_tests/lines-shield.xml rename to tests/visual_tests/styles/lines-shield.xml index 05a0f4fd2..4402411a7 100644 --- a/tests/visual_tests/lines-shield.xml +++ b/tests/visual_tests/styles/lines-shield.xml @@ -6,14 +6,14 @@ My Style osm - lines.osm + ../data/lines.osm diff --git a/tests/visual_tests/list.xml b/tests/visual_tests/styles/list.xml similarity index 85% rename from tests/visual_tests/list.xml rename to tests/visual_tests/styles/list.xml index 93ef3726d..e146ded22 100644 --- a/tests/visual_tests/list.xml +++ b/tests/visual_tests/styles/list.xml @@ -7,9 +7,9 @@ + ../data/points.osm--> shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/rtl-point.xml b/tests/visual_tests/styles/rtl-point.xml similarity index 92% rename from tests/visual_tests/rtl-point.xml rename to tests/visual_tests/styles/rtl-point.xml index c29a41797..54edac854 100644 --- a/tests/visual_tests/rtl-point.xml +++ b/tests/visual_tests/styles/rtl-point.xml @@ -10,7 +10,7 @@ points.osm --> shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/shieldsymbolizer-1.xml b/tests/visual_tests/styles/shieldsymbolizer-1.xml similarity index 58% rename from tests/visual_tests/shieldsymbolizer-1.xml rename to tests/visual_tests/styles/shieldsymbolizer-1.xml index 69ec6f2f5..90b456890 100644 --- a/tests/visual_tests/shieldsymbolizer-1.xml +++ b/tests/visual_tests/styles/shieldsymbolizer-1.xml @@ -6,53 +6,53 @@ My Style shape - points.shp + ../../data/points.shp diff --git a/tests/visual_tests/simple-E.xml b/tests/visual_tests/styles/simple-E.xml similarity index 90% rename from tests/visual_tests/simple-E.xml rename to tests/visual_tests/styles/simple-E.xml index 31e11acaa..9a0668bd0 100644 --- a/tests/visual_tests/simple-E.xml +++ b/tests/visual_tests/styles/simple-E.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/simple-N.xml b/tests/visual_tests/styles/simple-N.xml similarity index 90% rename from tests/visual_tests/simple-N.xml rename to tests/visual_tests/styles/simple-N.xml index 919e0d2b6..74265ec5a 100644 --- a/tests/visual_tests/simple-N.xml +++ b/tests/visual_tests/styles/simple-N.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/simple-NE.xml b/tests/visual_tests/styles/simple-NE.xml similarity index 90% rename from tests/visual_tests/simple-NE.xml rename to tests/visual_tests/styles/simple-NE.xml index 74c6a5d09..df1095195 100644 --- a/tests/visual_tests/simple-NE.xml +++ b/tests/visual_tests/styles/simple-NE.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/simple-NW.xml b/tests/visual_tests/styles/simple-NW.xml similarity index 90% rename from tests/visual_tests/simple-NW.xml rename to tests/visual_tests/styles/simple-NW.xml index 5e80dc607..120e26fcb 100644 --- a/tests/visual_tests/simple-NW.xml +++ b/tests/visual_tests/styles/simple-NW.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/simple-S.xml b/tests/visual_tests/styles/simple-S.xml similarity index 90% rename from tests/visual_tests/simple-S.xml rename to tests/visual_tests/styles/simple-S.xml index 1ada1baca..e738ab8b4 100644 --- a/tests/visual_tests/simple-S.xml +++ b/tests/visual_tests/styles/simple-S.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/simple-SE.xml b/tests/visual_tests/styles/simple-SE.xml similarity index 90% rename from tests/visual_tests/simple-SE.xml rename to tests/visual_tests/styles/simple-SE.xml index c8ee4f6d5..ae43761b0 100644 --- a/tests/visual_tests/simple-SE.xml +++ b/tests/visual_tests/styles/simple-SE.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/simple-SW.xml b/tests/visual_tests/styles/simple-SW.xml similarity index 90% rename from tests/visual_tests/simple-SW.xml rename to tests/visual_tests/styles/simple-SW.xml index 641452d4b..7b206417c 100644 --- a/tests/visual_tests/simple-SW.xml +++ b/tests/visual_tests/styles/simple-SW.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/simple-W.xml b/tests/visual_tests/styles/simple-W.xml similarity index 90% rename from tests/visual_tests/simple-W.xml rename to tests/visual_tests/styles/simple-W.xml index 012dc4375..cd0708a7a 100644 --- a/tests/visual_tests/simple-W.xml +++ b/tests/visual_tests/styles/simple-W.xml @@ -6,7 +6,7 @@ My Style shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/simple.xml b/tests/visual_tests/styles/simple.xml similarity index 77% rename from tests/visual_tests/simple.xml rename to tests/visual_tests/styles/simple.xml index cc008f598..61bb07748 100644 --- a/tests/visual_tests/simple.xml +++ b/tests/visual_tests/styles/simple.xml @@ -5,12 +5,8 @@ My Style - shape - points.shp + ../data/points.shp diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py index 8d9d3166f..cbc36bcad 100755 --- a/tests/visual_tests/test.py +++ b/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() diff --git a/tests/visual_tests/test_python.py b/tests/visual_tests/test_python.py index e45ab6e55..db6117c4c 100755 --- a/tests/visual_tests/test_python.py +++ b/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')