Changeset 6360 for branches/numpy/anuga/utilities/test_polygon.py

Timestamp:

Feb 18, 2009, 2:44:41 PM (14 years ago)

Author:

rwilson

Message:

Ongoing conversion changes.

File:

• branches/numpy/anuga/utilities/test_polygon.py (modified) (2 diffs)

branches/numpy/anuga/utilities/test_polygon.py

@@ -1561 +1561 @@
         point_spatial = Geospatial_data(point, geo_reference=points_geo_ref)
 
-        assert is_inside_polygon(point_absolute, polygon_absolute)
+        msg = ('point_absolute\n%s\nis not inside polygon_absolute\n%s'
+               % (str(point_absolute), str(polygon_absolute)))
+        assert is_inside_polygon(point_absolute, polygon_absolute), msg
+
+        msg = ('ensure_numeric(point_absolute)\n%s\n'
+               'is not inside ensure_numeric(polygon_absolute)\n%s'
+               % (str(ensure_numeric(ensure_numeric(point_absolute))),
+                  str(polygon_absolute)))
         assert is_inside_polygon(ensure_numeric(point_absolute),
-                                 ensure_numeric(polygon_absolute))
-        msg = ('point_absolute %s is not inside poly_spatial %s'
+                                 ensure_numeric(polygon_absolute)), msg
+
+        msg = ('point_absolute\n%s\nis not inside poly_spatial\n%s'
                % (str(point_absolute), str(poly_spatial)))
         assert is_inside_polygon(point_absolute, poly_spatial), msg
-        assert is_inside_polygon(point_spatial, poly_spatial)
-        assert is_inside_polygon(point_spatial, polygon_absolute)
-        assert is_inside_polygon(point_absolute, polygon_absolute)
+
+        msg = ('point_spatial\n%s\nis not inside poly_spatial\n%s'
+               % (str(point_spatial), str(poly_spatial)))
+        assert is_inside_polygon(point_spatial, poly_spatial), msg
+
+        msg = ('point_spatial\n%s\nis not inside polygon_absolute\n%s'
+               % (str(point_spatial), str(polygon_absolute)))
+        assert is_inside_polygon(point_spatial, polygon_absolute), msg
+
+        msg = ('point_absolute\n%s\nis not inside polygon_absolute\n%s'
+               % (str(point_absolute), str(polygon_absolute)))
+        assert is_inside_polygon(point_absolute, polygon_absolute), msg
 
     def NOtest_decimate_polygon(self):
@@ -1686 +1703 @@
         assert num.allclose(z, z_ref)
 
-
-# -------------------------------------------------------------
+################################################################################
+
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Polygon,'test')
-    suite = unittest.makeSuite(Test_Polygon,'test_inside_polygon_geospatial')
+    suite = unittest.makeSuite(Test_Polygon,'test')
+    #suite = unittest.makeSuite(Test_Polygon,'test_inside_polygon_geospatial')
     runner = unittest.TextTestRunner()
     runner.run(suite)