Changeset 6441 for branches/numpy/anuga/coordinate_transforms/test_geo_reference.py

Timestamp:

Mar 4, 2009, 8:26:22 AM (16 years ago)

Author:

rwilson

Message:

After changes to get_absolute, ensure_numeric, etc.

File:

• branches/numpy/anuga/coordinate_transforms/test_geo_reference.py (modified) (9 diffs)

branches/numpy/anuga/coordinate_transforms/test_geo_reference.py

@@ -239 +239 @@
         new_points = g.get_absolute(points)
 
-        self.failUnless(type(new_points) == types.ListType, 'failed')
+        self.failUnless(isinstance(new_points, list), 'failed')
         self.failUnless(type(new_points) == type(points), 'failed')
         for point, new_point in map(None, points, new_points):
@@ -250 +250 @@
         new_points = g.get_absolute(points)
 
-        self.failUnless(type(new_points) == types.ListType, 'failed')
+        self.failUnless(isinstance(new_points, list), 'failed')
         self.failUnless(type(new_points) == type(points), 'failed')
         for point, new_point in map(None, points, new_points):
@@ -259 +259 @@
         # first call
         dx = 10.0
-        dy = 10.0
+        dy = 12.0
         g = Geo_reference(56, dx, dy)
         points = [[3.0,34.0], [64.0,6.0]]
@@ -265 +265 @@
         new_points = g.get_absolute(points)
 
-        self.failUnless(type(new_points) == types.ListType, 'failed')
-        self.failUnless(type(new_points) == type(points), 'failed')
-        for point, new_point in map(None, expected_new_points, new_points):
-            self.failUnless(point[0] == new_point[0], 'failed')
-            self.failUnless(point[1] == new_point[1], 'failed')
+        self.failUnless(isinstance(new_points, list), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        self.failUnless(new_points == expected_new_points, 'failed')
 
         # and repeat from 'new_points = g.get_absolute(points)' above
@@ -275 +273 @@
         new_points = g.get_absolute(points)
 
-        self.failUnless(type(new_points) == types.ListType, 'failed')
-        self.failUnless(type(new_points) == type(points), 'failed')
-        for point, new_point in map(None, expected_new_points, new_points):
-            self.failUnless(point[0] == new_point[0], 'failed')
-            self.failUnless(point[1] == new_point[1], 'failed')
+        self.failUnless(isinstance(new_points, list), 'failed')
+        self.failUnless(type(new_points) == type(points), 'failed')
+        self.failUnless(new_points == expected_new_points, 'failed')
 
     def test_get_absolute_array(self):
@@ -294 +290 @@
         self.failUnless(isinstance(new_points, num.ndarray), 'failed')
         self.failUnless(type(new_points) == type(points), 'failed')
-        self.failUnless(num.alltrue(points == new_points), 'failed')
+        msg = 'points=\n%s\nnew_points=\n%s' % (str(points), str(new_points))
+        for point, new_point in map(None, points, new_points):
+            self.failUnless(point[0]+x == new_point[0], 'failed')
+            self.failUnless(point[1]+y == new_point[1], 'failed')
 
         # test with no supplied offsets
@@ -307 +306 @@
         # test that calling get_absolute twice does the right thing
         # first call
-        dx = 10.0
-        dy = 10.0
+        dx = 11.0
+        dy = 13.0
         g = Geo_reference(56, dx, dy)
         points = num.array([[3.0,34.0], [64.0,6.0]])
@@ -336 +335 @@
         self.failUnless(isinstance(new_points, num.ndarray), 'failed')
         self.failUnless(type(new_points) == type(points), 'failed')
-        msg = ('Second call of .get_absolute() returned %s\nexpected %s'
+        msg = ('Third call of .get_absolute() returned %s\nexpected %s'
                % (str(new_points), str(expected_new_points)))
         self.failUnless(num.alltrue(expected_new_points == new_points), msg)
@@ -534 +533 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(geo_referenceTestCase, 'test')
-    #suite = unittest.makeSuite(geo_referenceTestCase, 'test_functionality_get_absolute')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)