Skip to content

Commit 8b6d6fe

Browse files
committed
Unit tests - upgrade parameters_test
1 parent 0697787 commit 8b6d6fe

1 file changed

Lines changed: 18 additions & 37 deletions

File tree

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,52 @@
1-
#!/usr/bin/env python
2-
# -*- coding: utf-8 -*-
3-
4-
import os
51
import sys
6-
7-
from nose.tools import eq_
8-
92
import mapnik
103

11-
from .utilities import execution_path, run_all
12-
13-
14-
def setup():
15-
os.chdir(execution_path('.'))
16-
17-
184
def test_parameter_null():
195
p = mapnik.Parameter('key', None)
20-
eq_(p[0], 'key')
21-
eq_(p[1], None)
6+
assert p[0] == 'key'
7+
assert p[1] == None
228

239

2410
def test_parameter_string():
2511
p = mapnik.Parameter('key', 'value')
26-
eq_(p[0], 'key')
27-
eq_(p[1], 'value')
12+
assert p[0] == 'key'
13+
assert p[1] == 'value'
2814

2915

3016
def test_parameter_unicode():
3117
p = mapnik.Parameter('key', u'value')
32-
eq_(p[0], 'key')
33-
eq_(p[1], u'value')
18+
assert p[0] == 'key'
19+
assert p[1] == u'value'
3420

3521

3622
def test_parameter_integer():
3723
p = mapnik.Parameter('int', sys.maxsize)
38-
eq_(p[0], 'int')
39-
eq_(p[1], sys.maxsize)
24+
assert p[0] == 'int'
25+
assert p[1] == sys.maxsize
4026

4127

4228
def test_parameter_double():
4329
p = mapnik.Parameter('double', float(sys.maxsize))
44-
eq_(p[0], 'double')
45-
eq_(p[1], float(sys.maxsize))
30+
assert p[0] == 'double'
31+
assert p[1] == float(sys.maxsize)
4632

4733

4834
def test_parameter_boolean():
4935
p = mapnik.Parameter('boolean', True)
50-
eq_(p[0], 'boolean')
51-
eq_(p[1], True)
52-
eq_(bool(p[1]), True)
36+
assert p[0] == 'boolean'
37+
assert p[1] == True
38+
assert bool(p[1]) == True
5339

5440

5541
def test_parameters():
5642
params = mapnik.Parameters()
5743
p = mapnik.Parameter('float', 1.0777)
58-
eq_(p[0], 'float')
59-
eq_(p[1], 1.0777)
44+
assert p[0] == 'float'
45+
assert p[1] == 1.0777
6046

6147
params.append(p)
6248

63-
eq_(params[0][0], 'float')
64-
eq_(params[0][1], 1.0777)
65-
66-
eq_(params.get('float'), 1.0777)
67-
49+
assert params[0][0] == 'float'
50+
assert params[0][1] == 1.0777
6851

69-
if __name__ == "__main__":
70-
setup()
71-
exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
52+
assert params.get('float') == 1.0777

0 commit comments

Comments
 (0)