convert some unit tests to use pytest [WIP]

Author: artemp

test/python_tests/agg_rasterizer_integer_overflow_test.py

@@ -1,14 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 import json
-
-from nose.tools import eq_
-
 import mapnik
 
-from .utilities import run_all
-
 # geojson box of the world
 geojson = {"type": "Feature",
            "properties": {},
@@ -24,7 +16,6 @@
                                          [-17963313.143242701888084,
                                           -6300857.11560364998877]]]}}
 
-
 def test_that_coordinates_do_not_overflow_and_polygon_is_rendered_memory():
     expected_color = mapnik.Color('white')
     projection = 'epsg:4326'
@@ -52,8 +43,7 @@ def test_that_coordinates_do_not_overflow_and_polygon_is_rendered_memory():
     # m.zoom_to_box(mapnik.Box2d(-13658379.710221574,6195679.764683247,-13655933.72531645,6198125.749588372))
     im = mapnik.Image(256, 256)
     mapnik.render(m, im)
-    eq_(im.get_pixel(128, 128), expected_color.packed())
-
+    assert im.get_pixel(128, 128) ==  expected_color.packed()
 
 def test_that_coordinates_do_not_overflow_and_polygon_is_rendered_csv():
     expected_color = mapnik.Color('white')
@@ -84,7 +74,4 @@ def test_that_coordinates_do_not_overflow_and_polygon_is_rendered_csv():
     # m.zoom_to_box(mapnik.Box2d(-13658379.710221574,6195679.764683247,-13655933.72531645,6198125.749588372))
     im = mapnik.Image(256, 256)
     mapnik.render(m, im)
-    eq_(im.get_pixel(128, 128), expected_color.packed())
-
-if __name__ == "__main__":
-    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
+    assert im.get_pixel(128, 128) == expected_color.packed()

test/python_tests/box2d_test.py

@@ -1,184 +1,155 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from nose.tools import assert_almost_equal, assert_false, assert_true, eq_
-
 import mapnik
-
-from .utilities import run_all
-
+import pytest
 
 def test_coord_init():
     c = mapnik.Coord(100, 100)
-
-    eq_(c.x, 100)
-    eq_(c.y, 100)
-
+    assert c.x == 100
+    assert c.y == 100
 
 def test_coord_multiplication():
-    c = mapnik.Coord(100, 100)
-    c *= 2
-
-    eq_(c.x, 200)
-    eq_(c.y, 200)
-
+     c = mapnik.Coord(100, 100)
+     c *= 2
+     assert c.x == 200
+     assert c.y == 200
 
 def test_envelope_init():
-    e = mapnik.Box2d(100, 100, 200, 200)
-
-    assert_true(e.contains(100, 100))
-    assert_true(e.contains(100, 200))
-    assert_true(e.contains(200, 200))
-    assert_true(e.contains(200, 100))
-
-    assert_true(e.contains(e.center()))
-
-    assert_false(e.contains(99.9, 99.9))
-    assert_false(e.contains(99.9, 200.1))
-    assert_false(e.contains(200.1, 200.1))
-    assert_false(e.contains(200.1, 99.9))
-
-    eq_(e.width(), 100)
-    eq_(e.height(), 100)
-
-    eq_(e.minx, 100)
-    eq_(e.miny, 100)
-
-    eq_(e.maxx, 200)
-    eq_(e.maxy, 200)
-
-    eq_(e[0], 100)
-    eq_(e[1], 100)
-    eq_(e[2], 200)
-    eq_(e[3], 200)
-    eq_(e[0], e[-4])
-    eq_(e[1], e[-3])
-    eq_(e[2], e[-2])
-    eq_(e[3], e[-1])
-
-    c = e.center()
-
-    eq_(c.x, 150)
-    eq_(c.y, 150)
+     e = mapnik.Box2d(100, 100, 200, 200)
+     assert e.contains(100, 100)
+     assert e.contains(100, 200)
+     assert e.contains(200, 200)
+     assert e.contains(200, 100)
+     assert e.contains(e.center())
+     assert not e.contains(99.9, 99.9)
+     assert not e.contains(99.9, 200.1)
+     assert not e.contains(200.1, 200.1)
+     assert not e.contains(200.1, 99.9)
+     assert e.width() ==  100
+     assert e.height() == 100
+     assert e.minx ==  100
+     assert e.miny == 100
+     assert e.maxx == 200
+     assert e.maxy == 200
+     assert  e[0] == 100
+     assert  e[1] == 100
+     assert  e[2] == 200
+     assert  e[3] == 200
+     assert  e[0] == e[-4]
+     assert  e[1] == e[-3]
+     assert  e[2] == e[-2]
+     assert  e[3] == e[-1]
+     c = e.center()
+     assert  c.x == 150
+     assert  c.y == 150
 
 
 def test_envelope_static_init():
     e = mapnik.Box2d.from_string('100 100 200 200')
     e2 = mapnik.Box2d.from_string('100,100,200,200')
     e3 = mapnik.Box2d.from_string('100 , 100 , 200 , 200')
-    eq_(e, e2)
-    eq_(e, e3)
-
-    assert_true(e.contains(100, 100))
-    assert_true(e.contains(100, 200))
-    assert_true(e.contains(200, 200))
-    assert_true(e.contains(200, 100))
-
-    assert_true(e.contains(e.center()))
-
-    assert_false(e.contains(99.9, 99.9))
-    assert_false(e.contains(99.9, 200.1))
-    assert_false(e.contains(200.1, 200.1))
-    assert_false(e.contains(200.1, 99.9))
-
-    eq_(e.width(), 100)
-    eq_(e.height(), 100)
 
-    eq_(e.minx, 100)
-    eq_(e.miny, 100)
-
-    eq_(e.maxx, 200)
-    eq_(e.maxy, 200)
-
-    eq_(e[0], 100)
-    eq_(e[1], 100)
-    eq_(e[2], 200)
-    eq_(e[3], 200)
-    eq_(e[0], e[-4])
-    eq_(e[1], e[-3])
-    eq_(e[2], e[-2])
-    eq_(e[3], e[-1])
+    assert  e == e2
+    assert  e == e3
+    assert e.contains(100, 100)
+    assert e.contains(100, 200)
+    assert e.contains(200, 200)
+    assert e.contains(200, 100)
+
+    assert e.contains(e.center())
+    assert not e.contains(99.9, 99.9)
+    assert not e.contains(99.9, 200.1)
+    assert not e.contains(200.1, 200.1)
+    assert not e.contains(200.1, 99.9)
+
+    assert  e.width() == 100
+    assert  e.height() == 100
+    assert  e.minx == 100
+    assert  e.miny == 100
+    assert  e.maxx == 200
+    assert  e.maxy == 200
+
+    assert  e[0] == 100
+    assert  e[1] == 100
+    assert  e[2] == 200
+    assert  e[3] == 200
+    assert  e[0] == e[-4]
+    assert  e[1] == e[-3]
+    assert  e[2] == e[-2]
+    assert  e[3] == e[-1]
 
     c = e.center()
-
-    eq_(c.x, 150)
-    eq_(c.y, 150)
-
+    assert  c.x == 150
+    assert  c.y == 150
 
 def test_envelope_multiplication():
-    # no width then no impact of multiplication
-    a = mapnik.Box2d(100, 100, 100, 100)
-    a *= 5
-    eq_(a.minx, 100)
-    eq_(a.miny, 100)
-    eq_(a.maxx, 100)
-    eq_(a.maxy, 100)
-
-    a = mapnik.Box2d(100.0, 100.0, 100.0, 100.0)
-    a *= 5
-    eq_(a.minx, 100)
-    eq_(a.miny, 100)
-    eq_(a.maxx, 100)
-    eq_(a.maxy, 100)
-
-    a = mapnik.Box2d(100.0, 100.0, 100.001, 100.001)
-    a *= 5
-    assert_almost_equal(a.minx, 99.9979, places=3)
-    assert_almost_equal(a.miny, 99.9979, places=3)
-    assert_almost_equal(a.maxx, 100.0030, places=3)
-    assert_almost_equal(a.maxy, 100.0030, places=3)
-
-    e = mapnik.Box2d(100, 100, 200, 200)
-    e *= 2
-    eq_(e.minx, 50)
-    eq_(e.miny, 50)
-    eq_(e.maxx, 250)
-    eq_(e.maxy, 250)
-
-    assert_true(e.contains(50, 50))
-    assert_true(e.contains(50, 250))
-    assert_true(e.contains(250, 250))
-    assert_true(e.contains(250, 50))
-
-    assert_false(e.contains(49.9, 49.9))
-    assert_false(e.contains(49.9, 250.1))
-    assert_false(e.contains(250.1, 250.1))
-    assert_false(e.contains(250.1, 49.9))
-
-    assert_true(e.contains(e.center()))
-
-    eq_(e.width(), 200)
-    eq_(e.height(), 200)
-
-    eq_(e.minx, 50)
-    eq_(e.miny, 50)
-
-    eq_(e.maxx, 250)
-    eq_(e.maxy, 250)
-
-    c = e.center()
-
-    eq_(c.x, 150)
-    eq_(c.y, 150)
+     # no width then no impact of multiplication
+     a = mapnik.Box2d(100, 100, 100, 100)
+     a *= 5
+     assert a.minx == 100
+     assert a.miny == 100
+     assert a.maxx == 100
+     assert a.maxy == 100
+
+     a = mapnik.Box2d(100.0, 100.0, 100.0, 100.0)
+     a *= 5
+     assert  a.minx == 100
+     assert  a.miny == 100
+     assert  a.maxx == 100
+     assert  a.maxy == 100
+
+     a = mapnik.Box2d(100.0, 100.0, 100.001, 100.001)
+     a *= 5
+     assert a.minx == pytest.approx(99.9979, 1e-3)
+     assert a.miny == pytest.approx(99.9979, 1e-3)
+     assert a.maxx == pytest.approx(100.0030,1e-3)
+     assert a.maxy == pytest.approx(100.0030,1e-3)
+
+     e = mapnik.Box2d(100, 100, 200, 200)
+     e *= 2
+     assert  e.minx == 50
+     assert  e.miny == 50
+     assert  e.maxx == 250
+     assert  e.maxy == 250
+
+     assert e.contains(50, 50)
+     assert e.contains(50, 250)
+     assert e.contains(250, 250)
+     assert e.contains(250, 50)
+
+     assert not e.contains(49.9, 49.9)
+     assert not e.contains(49.9, 250.1)
+     assert not e.contains(250.1, 250.1)
+     assert not e.contains(250.1, 49.9)
+
+     c = e.center()
+     assert  c.x == 150
+     assert  c.y == 150
+
+     assert e.contains(c)
+
+     assert  e.width() == 200
+     assert  e.height()== 200
+
+     assert  e.minx == 50
+     assert  e.miny == 50
+
+     assert  e.maxx == 250
+     assert  e.maxy == 250
 
 
 def test_envelope_clipping():
-    e1 = mapnik.Box2d(-180, -90, 180, 90)
-    e2 = mapnik.Box2d(-120, 40, -110, 48)
-    e1.clip(e2)
-    eq_(e1, e2)
-
-    # madagascar in merc
-    e1 = mapnik.Box2d(4772116.5490, -2744395.0631, 5765186.4203, -1609458.0673)
-    e2 = mapnik.Box2d(5124338.3753, -2240522.1727, 5207501.8621, -2130452.8520)
-    e1.clip(e2)
-    eq_(e1, e2)
-
-    # nz in lon/lat
-    e1 = mapnik.Box2d(163.8062, -47.1897, 179.3628, -33.9069)
-    e2 = mapnik.Box2d(173.7378, -39.6395, 174.4849, -38.9252)
-    e1.clip(e2)
-    eq_(e1, e2)
-
-if __name__ == "__main__":
-    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
+     e1 = mapnik.Box2d(-180, -90, 180, 90)
+     e2 = mapnik.Box2d(-120, 40, -110, 48)
+     e1.clip(e2)
+     assert  e1 == e2
+
+     # madagascar in merc
+     e1 = mapnik.Box2d(4772116.5490, -2744395.0631, 5765186.4203, -1609458.0673)
+     e2 = mapnik.Box2d(5124338.3753, -2240522.1727, 5207501.8621, -2130452.8520)
+     e1.clip(e2)
+     assert  e1 == e2
+
+#     # nz in lon/lat
+     e1 = mapnik.Box2d(163.8062, -47.1897, 179.3628, -33.9069)
+     e2 = mapnik.Box2d(173.7378, -39.6395, 174.4849, -38.9252)
+     e1.clip(e2)
+     assert  e1 == e2