Skip to content

Commit 2a92ab0

Browse files
committed
Unit tests - 'pytest` [WIP]
1 parent 114bab7 commit 2a92ab0

File tree

4 files changed

+28
-65
lines changed

4 files changed

+28
-65
lines changed
Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
1-
#!/usr/bin/env python
2-
from nose.tools import eq_
3-
41
import mapnik
52

6-
from .utilities import run_all
7-
8-
93
def test_logger_init():
10-
eq_(mapnik.severity_type.Debug, 0)
11-
eq_(mapnik.severity_type.Warn, 1)
12-
eq_(mapnik.severity_type.Error, 2)
13-
eq_(getattr(mapnik.severity_type, "None"), 3)
4+
assert mapnik.severity_type.Debug == 0
5+
assert mapnik.severity_type.Warn == 1
6+
assert mapnik.severity_type.Error == 2
7+
assert getattr(mapnik.severity_type, "None") == 3
148
default = mapnik.logger.get_severity()
159
mapnik.logger.set_severity(mapnik.severity_type.Debug)
16-
eq_(mapnik.logger.get_severity(), mapnik.severity_type.Debug)
10+
assert mapnik.logger.get_severity() == mapnik.severity_type.Debug
1711
mapnik.logger.set_severity(default)
18-
eq_(mapnik.logger.get_severity(), default)
19-
20-
if __name__ == "__main__":
21-
exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
12+
assert mapnik.logger.get_severity() == default
Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
1-
# encoding: utf8
2-
from nose.tools import eq_
3-
41
import mapnik
52

6-
from .utilities import run_all
7-
8-
93
def test_add_feature():
104
md = mapnik.MemoryDatasource()
11-
eq_(md.num_features(), 0)
5+
assert md.num_features() == 0
126
context = mapnik.Context()
137
context.push('foo')
148
feature = mapnik.Feature(context, 1)
159
feature['foo'] = 'bar'
1610
feature.geometry = mapnik.Geometry.from_wkt('POINT(2 3)')
1711
md.add_feature(feature)
18-
eq_(md.num_features(), 1)
12+
assert md.num_features() == 1
1913

2014
featureset = md.features_at_point(mapnik.Coord(2, 3))
2115
retrieved = []
2216

2317
for feat in featureset:
2418
retrieved.append(feat)
2519

26-
eq_(len(retrieved), 1)
20+
assert len(retrieved) == 1
2721
f = retrieved[0]
28-
eq_(f['foo'], 'bar')
22+
assert f['foo'] == 'bar'
2923

3024
featureset = md.features_at_point(mapnik.Coord(20, 30))
3125
retrieved = []
3226
for feat in featureset:
3327
retrieved.append(feat)
34-
eq_(len(retrieved), 0)
35-
36-
if __name__ == "__main__":
37-
exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
28+
assert len(retrieved) == 0
Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
1-
#!/usr/bin/env python
2-
3-
import os
4-
5-
from nose.tools import eq_
6-
71
import mapnik
82

9-
from .utilities import execution_path, run_all
10-
11-
12-
def setup():
13-
# All of the paths used are relative, if we run the tests
14-
# from another directory we need to chdir()
15-
os.chdir(execution_path('.'))
16-
17-
183
def test_multi_tile_policy():
194
srs = 'epsg:4326'
205
lyr = mapnik.Layer('raster')
216
if 'raster' in mapnik.DatasourceCache.plugin_names():
227
lyr.datasource = mapnik.Raster(
23-
file='../data/raster_tiles/${x}/${y}.tif',
8+
file='./test/data/raster_tiles/${x}/${y}.tif',
249
lox=-180,
2510
loy=-90,
2611
hix=180,
@@ -46,29 +31,25 @@ def test_multi_tile_policy():
4631
mapnik.render(_map, im)
4732

4833
# test green chunk
49-
eq_(im.view(0, 64, 1, 1).tostring(), b'\x00\xff\x00\xff')
50-
eq_(im.view(127, 64, 1, 1).tostring(), b'\x00\xff\x00\xff')
51-
eq_(im.view(0, 127, 1, 1).tostring(), b'\x00\xff\x00\xff')
52-
eq_(im.view(127, 127, 1, 1).tostring(), b'\x00\xff\x00\xff')
34+
assert im.view(0, 64, 1, 1).tostring() == b'\x00\xff\x00\xff'
35+
assert im.view(127, 64, 1, 1).tostring() == b'\x00\xff\x00\xff'
36+
assert im.view(0, 127, 1, 1).tostring() == b'\x00\xff\x00\xff'
37+
assert im.view(127, 127, 1, 1).tostring() == b'\x00\xff\x00\xff'
5338

5439
# test blue chunk
55-
eq_(im.view(128, 64, 1, 1).tostring(), b'\x00\x00\xff\xff')
56-
eq_(im.view(255, 64, 1, 1).tostring(), b'\x00\x00\xff\xff')
57-
eq_(im.view(128, 127, 1, 1).tostring(), b'\x00\x00\xff\xff')
58-
eq_(im.view(255, 127, 1, 1).tostring(), b'\x00\x00\xff\xff')
40+
assert im.view(128, 64, 1, 1).tostring() == b'\x00\x00\xff\xff'
41+
assert im.view(255, 64, 1, 1).tostring() == b'\x00\x00\xff\xff'
42+
assert im.view(128, 127, 1, 1).tostring() == b'\x00\x00\xff\xff'
43+
assert im.view(255, 127, 1, 1).tostring() == b'\x00\x00\xff\xff'
5944

6045
# test red chunk
61-
eq_(im.view(0, 128, 1, 1).tostring(), b'\xff\x00\x00\xff')
62-
eq_(im.view(127, 128, 1, 1).tostring(), b'\xff\x00\x00\xff')
63-
eq_(im.view(0, 191, 1, 1).tostring(), b'\xff\x00\x00\xff')
64-
eq_(im.view(127, 191, 1, 1).tostring(), b'\xff\x00\x00\xff')
46+
assert im.view(0, 128, 1, 1).tostring() == b'\xff\x00\x00\xff'
47+
assert im.view(127, 128, 1, 1).tostring() == b'\xff\x00\x00\xff'
48+
assert im.view(0, 191, 1, 1).tostring() == b'\xff\x00\x00\xff'
49+
assert im.view(127, 191, 1, 1).tostring() == b'\xff\x00\x00\xff'
6550

6651
# test magenta chunk
67-
eq_(im.view(128, 128, 1, 1).tostring(), b'\xff\x00\xff\xff')
68-
eq_(im.view(255, 128, 1, 1).tostring(), b'\xff\x00\xff\xff')
69-
eq_(im.view(128, 191, 1, 1).tostring(), b'\xff\x00\xff\xff')
70-
eq_(im.view(255, 191, 1, 1).tostring(), b'\xff\x00\xff\xff')
71-
72-
if __name__ == "__main__":
73-
setup()
74-
exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
52+
assert im.view(128, 128, 1, 1).tostring() == b'\xff\x00\xff\xff'
53+
assert im.view(255, 128, 1, 1).tostring() == b'\xff\x00\xff\xff'
54+
assert im.view(128, 191, 1, 1).tostring() == b'\xff\x00\xff\xff'
55+
assert im.view(255, 191, 1, 1).tostring() == b'\xff\x00\xff\xff'

test/python_tests/my.pdf

-6.88 KB
Binary file not shown.

0 commit comments

Comments
 (0)