sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renable lines-shield test and always generate missing reference images - closes #1696

Browse source
This commit is contained in:
Dane Springmeyer 2013-05-16 13:17:48 -07:00
parent b6a937e93d
commit 71870a47b5
13 changed files with 579 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
tests/visual_tests/grids/lines-shield-200-200-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,66 @@
{
"keys": [
"",
"212",
"210",
"208",
"132",
"206",
"200",
"202",
"204"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" !! !!! !! !!! !! !!! ",
" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
" !! !! !! !! !! !! ",
" ! ! ! ",
" ",
" ### ",
" ############################################# ",
" ## ",
" # $ $ ",
" %% $$ $$ $$ $$ $$ ",
" %%$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ",
" %% $ $$ $ $$ $ ",
" ",
" ",
" ",
" && ",
" ''' &&&&&&&&&& ( (( ",
" '' ' && (( ( ( ",
" ' '' (((( ( ",
" ' ''''' (( (( ",
" ''' ''' ( ( ( ",
" ' '' )) ((( ",
" ' )))))))))) ",
" )) ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

118
tests/visual_tests/grids/lines-shield-400-400-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,118 @@
{
"keys": [
"",
"216",
"212",
"210",
"132",
"208",
"240",
"206",
"202",
"200",
"204"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ! ! ! ! ! ! ",
" !! !! !! !! !! !! !! !! !! !! !! !! ",
" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
" !!! !! !!! !! !!! !! !!! !! !!! !! !!! !! ",
" ",
" ",
" ",
" ",
" # # # # # # ",
" # ## # ## # ## # ## # ## # ## ",
" # ## # ## # ## # ## # ## # ## ",
" ### # ### # ### # ### # ### # ### # ",
" ",
" ",
" ",
" ",
" ",
" ",
" $ $ $ $ $ ",
" $$ $$ $$ $ $ $$ $$ $$ $ $ $ ",
" $$ $$ $$ $ $ $ $$ $$ $ $ $ ",
" $$$ $ $ $ $ $$$ $$$ $ $ $ $$$ $$$ ",
" ",
" ",
" ",
" % & & & & & & ",
" %% && && && && && && && && && && && ",
" %%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& ",
" %%% && & && & && & && & && & && ",
" ",
" ' ' ' ' ' ' ",
" ' '' ' '' ' '' ' '' ' '' ' '' ",
" '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
" ' '' ' '' ' '' ' '' ' '' ' '' ",
" ' ' ' ' ' ' ",
" ",
" ",
" ",
" (( ( ( )) )))) ) ",
" *** *** ((((((((((((((((((( )))) ))) ",
" ***** *** (( ( )) ) ",
" ** ** ) ))) ",
" ** *** ) ) ",
" ) ",
" * * ",
" * * ) ) ",
" * )) ",
" * * ) )) ",
" ** ** )))) )))) ",
" **** **** + )))) )))) ",
" * * * ** ++ + ) ",
" * * +++++++++++++++++++ ",
" ++ + ",
" + ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

168
tests/visual_tests/grids/lines-shield-600-600-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,168 @@
{
"keys": [
"",
"216",
"212",
"210",
"208",
"132",
"240",
"202",
"200",
"206",
"204"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ! !!! ! !!! ! !!! ! !!! ! !!! ! !!! ! !!! ! !!! ! !!! ",
" ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ",
" !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! ",
" ! ! ! ! ! ! ! ! ! ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" # # # # # # # # # ",
" # ## # ## # ## # ## # ## # ## # ## # ## # ## ",
" ######################################################################################################################################## ",
" # ## # ## # ## # ## # ## # ## # ## # ## # ## ",
" # # # # # # # # # ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" $ $ $ $ $ $ $ $ $ ",
" $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ ",
" $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ",
" $$ $$$ $$ $$$ $$ $$$ $$ $$$ $$ $$$ $$ $$$ $$ $$$ $$ $$$ $$ $$$ ",
" $ $ $ $ $ $ $ $ $ ",
" ",
" ",
" ",
" ",
" ",
" ",
" % % % % % % % % ",
" && %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% %% ",
" &&%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ",
" && % %% % %% % %% % %% % %% % %% % %% % %% % ",
" ",
" ",
" ",
" ",
" '' ' ' '' ' ' '' ' ' '' ' ' '' ' ' '' ' ' '' ' ' '' ' ' '' ' ' ",
" '' ' '' ' '' ' '' ' '' ' '' ' '' ' '' ' '' ' ",
" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' ",
" ''' ' ' ''' ' ' ''' ' ' ''' ' ' ''' ' ' ''' ' ' ''' ' ' ''' ' ' ''' ' ' ",
" ",
" ",
" ",
" ",
" ",
" ",
" ( ( (( ( ",
" ) ** * *** (( ((( ",
" )) ) )) )) **************************** (((( (( ",
" )))) )))) ** ** ** ((( ( ",
" ) ))) ))) * * ( ( ",
" ) ) ",
" ) (( ( ",
" ))) ) (((( (( ",
" ) ) ( ( (( ",
" ) )))) ( (( ",
" ))) )) ( ",
" ) ) ( ",
" ) ( ( ",
" ) ((( ",
" ) ) ( (( ",
" )) ) ) ( (((( ",
" ))))) ) ( ( ( ",
" ))) ) ( ( ( (( ",
" ) ) ))) ) + + ((( ",
" )) ) ++ ++ ++ (( ",
" )))) ++++++++++++++++++++++++++++ ",
" ) ) ++ ++ +++ ",
" + + ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

218
tests/visual_tests/grids/lines-shield-800-800-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,218 @@
{
"keys": [
"",
"216",
"212",
"210",
"132",
"208",
"240",
"202",
"200",
"206",
"204"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ! ! ! ! ! ! ! ! ! ! ! ! ",
" !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! !! ",
" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
" !! ! ! !! ! ! !! ! ! !! ! ! !! ! ! !! ! ! !! ! ! !! ! ! !! ! ! !! ! ! !! ! ! !! ! ! ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" # ### # ### # ### # ### # ### # ### # ### # ### # ### # ### # ### # ### ",
" ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ",
" ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ",
" # # # # # # # # # # # # ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" $$ $$$ $$$ $ $ $ $$ $$ $$$ $$$ $ $ $ $$ $$ $$$ $$$ $ $ $ $$ $$ $$$ $$$ $ $$ ",
" $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ ",
" $$ $$ $ $$ $$ $$ $$ $$ $ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ $$ ",
" $ $ $ $ $ $ $ $ $ $ $ $ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" % & & & & & & & & & & & & ",
" %% && && && && && && && && && && && && && && && && && && && && && && && ",
" %%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& ",
" %%% && & && & && & && & && & && & && & && & && & && & && & && ",
" ",
" ",
" ",
" ",
" ",
" ",
" ' ' ' ' ' ' ' ' ' ' ' ' ",
" ' '' ' '' ' '' ' '' ' '' ' '' ' '' ' '' ' '' ' '' ' '' ' '' ",
" '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ",
" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' ",
" ' ' ' ' ' ' ' ' ' ' ' ' ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ( ",
" (((( ( (( ",
" ) *** * * ** * * * ((( ((((( ",
" ) ) ) ) * * * * ** ( ( ((( ",
" )))) )))) ** ** ** ** ** ( ( ( ",
" )) ))) )))) * * (( ( ",
" ) )) ( ((( ",
" ))) (( ((((( ",
" ) )) ( ( ",
" )) )) ( ( ",
" ) )) ( ",
" ) ( ( ",
" ) ",
" (( (( ",
" ) ) (((( (( ",
" ) (( (((( ",
" )))) )) ( (( ",
" )) )))) (( ",
" )) ( ( ",
" ) ( ( ",
" ) ) ( ( ( ( ",
" ) (((( (( ",
" ))) ) ((( ((((( ",
" )) ))) (( ( ( (( ",
" ))) )))) (((((( ( ",
" ) ) )) )) + + + (((( ",
" ))) ) ++ ++ ++ ++ ++ (( ",
" )))) ++++++++++++++++++++++++++++++++++++++ ",
" ) +++ ++ ++ + ++ ",
" + + + ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

BIN
tests/visual_tests/images/lines-shield-200-200-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
tests/visual_tests/images/lines-shield-200-200-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
tests/visual_tests/images/lines-shield-400-400-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
tests/visual_tests/images/lines-shield-400-400-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
tests/visual_tests/images/lines-shield-600-600-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
tests/visual_tests/images/lines-shield-800-800-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
tests/visual_tests/images/lines-shield-800-800-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

17
tests/visual_tests/test.py
View file

@ -43,7 +43,7 @@ files = [
# https://github.com/mapnik/mapnik/issues/1696
# https://github.com/mapnik/mapnik/issues/1521
# fails with clang++ on os x
#{'name': "lines-shield", 'sizes': sizes_few_square,'bbox':default_text_box},
{'name': "lines-shield", 'sizes': sizes_few_square,'bbox':default_text_box},
{'name': "collision", 'sizes':[(600,400)]},
{'name': "marker-svg-opacity"},
{'name': "marker-multi-policy", 'sizes':[(600,400)]},
@ -103,11 +103,10 @@ class Reporting:
NOT_FOUND = 2
OTHER = 3
REPLACE = 4
def __init__(self, quiet, generate = False, overwrite_failures = False):
def __init__(self, quiet, overwrite_failures = False):
self.quiet = quiet
self.passed = 0
self.failed = 0
self.generate = generate
self.overwrite_failures = overwrite_failures
self.errors = [ #(type, actual, expected, diff, message)
]
@ -119,7 +118,7 @@ class Reporting:
else:
print '\x1b[31m✘\x1b[0m (\x1b[34m%u different pixels\x1b[0m)' % diff
if self.generate:
if self.overwrite_failures:
self.errors.append((self.REPLACE, actual, expected, diff, None))
contents = open(actual, 'r').read()
open(expected, 'wb').write(contents)
@ -139,8 +138,7 @@ class Reporting:
if self.quiet:
sys.stderr.write('\x1b[33m.\x1b[0m')
else:
print '\x1b[33m?\x1b[0m (\x1b[34mReference file not found\x1b[0m)'
if self.generate:
print '\x1b[33m?\x1b[0m (\x1b[34mReference file not found, creating\x1b[0m)'
contents = open(actual, 'r').read()
open(expected, 'wb').write(contents)
@ -152,7 +150,7 @@ class Reporting:
else:
print '\x1b[31m✘\x1b[0m (\x1b[34m%s\x1b[0m)' % message
def summary(self, generate=False):
def summary(self):
if len(self.errors) == 0:
print '\nAll %s visual tests passed: \x1b[1;32m✓ \x1b[0m' % self.passed
return 0
@ -161,10 +159,7 @@ class Reporting:
if error[0] == self.OTHER:
print str(idx+1) + ") \x1b[31mfailure to run test:\x1b[0m %s" % error[2]
elif error[0] == self.NOT_FOUND:
if self.generate:
print str(idx+1) + ") Generating reference image: '%s'" % error[2]
else:
print str(idx+1) + ")Could not verify %s: No reference image found!" % error[1]
continue
elif error[0] == self.DIFF:
print str(idx+1) + ") \x1b[34m%s different pixels\x1b[0m:\n\t%s (\x1b[31mactual\x1b[0m)\n\t%s (\x1b[32mexpected\x1b[0m)" % (error[3], error[1], error[2])
@ -289,6 +284,6 @@ if __name__ == "__main__":
reporting)
mapnik.save_map(m, os.path.join(dirname, 'xml_output', "%s-out.xml" % config['name']))
sys.exit(reporting.summary(generate=True))
sys.exit(reporting.summary())
else:
print "OSM plugin required"