Changeset 7858 for trunk/anuga_core/source/anuga/geometry/test_polygon.py

Timestamp:

Jun 18, 2010, 4:43:10 PM (13 years ago)

Author:

hudson

Message:

Refactorings to increase code quality, fixed missing log import from sww_interrogate.

File:

• trunk/anuga_core/source/anuga/geometry/test_polygon.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/geometry/test_polygon.py

@@ -8 +8 @@
 
 from polygon import *
+from polygon import _poly_xy
+from polygon_function import Polygon_function
 from anuga.coordinate_transforms.geo_reference import Geo_reference
 from anuga.geospatial_data.geospatial_data import Geospatial_data
@@ -1570 +1572 @@
         # Simplest case: Polygon is the unit square
         polygon = [[0,0], [1,0], [1,1], [0,1]]
-        x, y = poly_xy(polygon)
+        x, y = _poly_xy(polygon)
         assert len(x) == len(polygon)+1
         assert len(y) == len(polygon)+1
@@ -1584 +1586 @@
     # Arbitrary polygon
         polygon = [[1,5], [1,1], [100,10], [1,10], [3,6]]
-        x, y = poly_xy(polygon)
+        x, y = _poly_xy(polygon)
         assert len(x) == len(polygon)+1
         assert len(y) == len(polygon)+1
@@ -1605 +1607 @@
         polygon1 = [[0,0], [1,0], [1,1], [0,1]]
         polygon2 = [[1,1], [2,1], [3,2], [2,2]]
-        v = plot_polygons([polygon1, polygon2], figname='test1')
-        assert len(v) == 4
-        assert v[0] == 0
-        assert v[1] == 3
-        assert v[2] == 0
-        assert v[3] == 2
+        plot_polygons([polygon1, polygon2], figname='test1')
 
         # Another case
         polygon3 = [[1,5], [10,1], [100,10], [50,10], [3,6]]
         v = plot_polygons([polygon2,polygon3], figname='test2')
-        assert len(v) == 4
-        assert v[0] == 1
-        assert v[1] == 100
-        assert v[2] == 1
-        assert v[3] == 10
-
-        os.remove('test1.png')
-        os.remove('test2.png')
+
+        for file in ['test1.png', 'test2.png']:
+            assert os.access(file, os.R_OK)
+            os.remove(file)
+
 
     def test_inside_polygon_geospatial(self):