Changeset 3097

Timestamp:

Jun 6, 2006, 12:25:25 PM (18 years ago)

Author:

duncan

Message:

Fixed some tests

Location:

inundation

Files:

• pmesh/test_mesh.py (modified) (7 diffs)
• test_all.py (modified) (1 diff)

inundation/pmesh/test_mesh.py

@@ -9 +9 @@
     from mesh import *
     
-from mesh import *
 from load_mesh.loadASCII import *
 from coordinate_transforms.geo_reference import Geo_reference
-from utilities.polygon import inside_polygon
+from utilities.polygon import  is_inside_polygon ### inside_polygon
 
 class meshTestCase(unittest.TestCase):
@@ -1584 +1583 @@
     def test_Discretised_Tuple_Set_rounding(self):
         #This is the hardest bit of DST
-        from mesh import Discretised_Tuple_Set
 
         tol = 0.1
@@ -1619 +1617 @@
 
     def test_Discretised_Tuple_Set_get(self):
-        from mesh import Discretised_Tuple_Set
+        
         tol = 0.25
         a=Discretised_Tuple_Set(p_rel=1,t_rel = tol)
@@ -1635 +1633 @@
 
     def test_mapped_Discretised_Tuple_Set(self):
-
-        from mesh import Mapped_Discretised_Tuple_Set
-        from mesh import Discretised_Tuple_Set
 
         def map(sequence):
@@ -1713 +1708 @@
         # poly_point values are relative to the mesh geo-ref
         # make them absolute
-        self.failUnless(inside_polygon([poly_point.x+x,poly_point.y+y],
+        self.failUnless(is_inside_polygon([poly_point.x+x,poly_point.y+y],
                                        polygon_absolute, closed = False),
                         'FAILED!')
@@ -1811 +1806 @@
         # make them absolute
         #print "poly_point.x+x",poly_point.x+x
+        #print "poly_point.y+y",poly_point.y+y
         #print "polygon_absolute", polygon_absolute 
-        self.failUnless(inside_polygon([poly_point.x+x,poly_point.y+y],
+        self.failUnless(is_inside_polygon([poly_point.x+x,poly_point.y+y],
                                        polygon_absolute, closed = False),
                         'FAILED!')
@@ -2000 +1996 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(meshTestCase,'test')
-    #suite = unittest.makeSuite(meshTestCase,'test_duplicat_verts_do_what')
+    #suite = unittest.makeSuite(meshTestCase,'test_add_hole_from_polygon')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)

inundation/test_all.py

@@ -18 +18 @@
 exclude_files = ['test_metis.py', 'test_version.py', 'test_parallel_sw.py',
                  'test_advection.py', # removing this test for a bit
-                 'test_mesh.py', # bug fixing
+                 #'test_mesh.py', # bug fixing
                  'test_interpolate_sww.py' # this test is obsolete
                  ]