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

upgrade python api tests to use new mapnik.Expression and mapnik.PathExpression syntax

Browse source
This commit is contained in:
Dane Springmeyer 2010-01-26 23:11:18 +00:00
parent 9b69f65ea9
commit 56e1b96b45
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/python_tests/filter_test.py
View file

@ -5,6 +5,9 @@ from utilities import Todo
import mapnik
if hasattr(mapnik,'Expression'):
mapnik.Filter = mapnik.Expression
map_ = '''<Map>
<Style name="s">
<Rule>

2
tests/python_tests/introspection_test.py
View file

@ -7,7 +7,7 @@ import mapnik
def test_introspect_symbolizers():
# create a symbolizer
p = mapnik.PointSymbolizer("../data/images/dummy.png", "png", 16, 16)
p = mapnik.PointSymbolizer(mapnik.PathExpression("../data/images/dummy.png"))
p.allow_overlap = True
p.opacity = 0.5

14
tests/python_tests/object_test.py
View file

@ -9,12 +9,12 @@ import mapnik, pickle
# ShieldSymbolizer initialization
def test_shieldsymbolizer_init():
s = mapnik.ShieldSymbolizer('Field Name', 'DejaVu Sans Bold', 6, mapnik.Color('#000000'), '../data/images/dummy.png', 'png', 16, 16)
s = mapnik.ShieldSymbolizer(mapnik.Expression('[Field Name]'), 'DejaVu Sans Bold', 6, mapnik.Color('#000000'), mapnik.PathExpression('../data/images/dummy.png'))
# ShieldSymbolizer missing image file
@raises(RuntimeError)
def test_shieldsymbolizer_missing_image():
s = mapnik.ShieldSymbolizer('Field Name', 'DejaVu Sans Bold', 6, mapnik.Color('#000000'), '../data/images/broken.png', 'png', 16, 16)
s = mapnik.ShieldSymbolizer(mapnik.Expression('[Field Name]'), 'DejaVu Sans Bold', 6, mapnik.Color('#000000'), mapnik.PathExpression('../data/images/broken.png'))
# PointSymbolizer initialization
def test_pointsymbolizer_init():
@ -23,7 +23,7 @@ def test_pointsymbolizer_init():
eq_(p.opacity,1)
eq_(p.filename,'')
p = mapnik.PointSymbolizer("../data/images/dummy.png", "png", 16, 16)
p = mapnik.PointSymbolizer(mapnik.PathExpression("../data/images/dummy.png"))
eq_(p.allow_overlap, False)
eq_(p.opacity, 1)
eq_(p.filename,'../data/images/dummy.png')
@ -31,11 +31,11 @@ def test_pointsymbolizer_init():
# PointSymbolizer missing image file
@raises(RuntimeError)
def test_pointsymbolizer_missing_image():
p = mapnik.PointSymbolizer("../data/images/broken.png", "png", 16, 16)
p = mapnik.PointSymbolizer(mapnik.PathExpression("../data/images/broken.png"))
# PointSymbolizer pickling
def test_pointsymbolizer_pickle():
p = mapnik.PointSymbolizer("../data/images/dummy.png", "png", 16, 16)
p = mapnik.PointSymbolizer(mapnik.PathExpression("../data/images/dummy.png"))
p2 = pickle.loads(pickle.dumps(p,pickle.HIGHEST_PROTOCOL))
# image type, width, and height only used in contructor...
eq_(p.filename, p2.filename)
@ -178,7 +178,7 @@ def test_shapefile_properties():
# TextSymbolizer initialization
def test_textsymbolizer_init():
ts = mapnik.TextSymbolizer('Field Name', 'Font Name', 8, mapnik.Color('black'))
ts = mapnik.TextSymbolizer(mapnik.Expression('[Field Name]'), 'Font Name', 8, mapnik.Color('black'))
eq_(ts.name, 'Field Name')
eq_(ts.face_name, 'Font Name')
@ -187,7 +187,7 @@ def test_textsymbolizer_init():
# TextSymbolizer pickling
def test_textsymbolizer_pickle():
ts = mapnik.TextSymbolizer('Field Name', 'Font Name', 8, mapnik.Color('black'))
ts = mapnik.TextSymbolizer(mapnik.Expression('[Field Name]'), 'Font Name', 8, mapnik.Color('black'))
eq_(ts.name, 'Field Name')
eq_(ts.face_name, 'Font Name')