Changeset 6520

Timestamp:

Mar 16, 2009, 1:35:50 PM (15 years ago)

Author:

ole

Message:

Removed print statements and reinstated assertions in tests for nonstandard projections.

File:

• anuga_core/source/anuga/coordinate_transforms/test_redfearn.py (modified) (3 diffs)

anuga_core/source/anuga/coordinate_transforms/test_redfearn.py

@@ -308 +308 @@
                                                    zone=forced_zone)
                 
-                print
-                print 'Lat', lat
-                print 'Lon', lon
-                print 'Zone', zone
-                print 'Ref x', x, 'Computed x', easting, 'Close enough:', num.allclose(x, easting)
-                print 'Ref y', y, 'Computed y', northing, 'Close enough:', num.allclose(y, northing)
-                
                 # Check calculation
                 assert zone == forced_zone
-                print 
-                #assert num.allclose(x, easting)
-                #assert num.allclose(y, northing)
+                assert num.allclose(x, easting)
+                assert num.allclose(y, northing)
 
     
@@ -353 +345 @@
                                                scale_factor=0.9996)
 
-            print
-            print 'Lat', lat
-            print 'Lon', lon
-            print 'Zone', zone
-            print 'Ref x', x, 'Computed x', easting, 'Close enough:', num.allclose(x, easting)
-            print 'Ref y', y, 'Computed y', northing, 'Close enough:', num.allclose(y, northing)
-
-            # Check calculation
             assert zone == -1 # Indicates non UTM projection
-            print 
-            #assert num.allclose(x, easting)
-            #assert num.allclose(y, northing)
+            assert num.allclose(x, easting)
+            assert num.allclose(y, northing)
 
         # Test that zone and meridian can't both be specified
@@ -524 +507 @@
 if __name__ == "__main__":
 
-    #mysuite = unittest.makeSuite(TestCase,'test_convert_latlon_to_UTM1')
-    mysuite = unittest.makeSuite(TestCase,'test_nonstandard_meridian_coinciding_with_native')
-    #mysuite = unittest.makeSuite(TestCase,'test')
+    mysuite = unittest.makeSuite(TestCase,'test')
     runner = unittest.TextTestRunner()
     runner.run(mysuite)