Changeset 7778 for trunk/anuga_core/source/anuga/file_conversion/test_urs2sts.py

Timestamp:

Jun 4, 2010, 10:03:48 PM (14 years ago)

Author:

hudson

Message:

Cleaned up unit tests to use API.

File:

• trunk/anuga_core/source/anuga/file_conversion/test_urs2sts.py (modified) (10 diffs)

trunk/anuga_core/source/anuga/file_conversion/test_urs2sts.py

@@ -13 +13 @@
 from anuga.file.csv_file import load_csv_as_dict, load_csv_as_array
 
+from anuga.shallow_water.shallow_water_domain import Domain
+
 # boundary functions
 from anuga.shallow_water.boundaries import Reflective_boundary, \
@@ -20 +22 @@
      import Transmissive_boundary, Dirichlet_boundary, \
             Time_boundary, File_boundary, AWI_boundary
+
+from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
 from urs2sts import urs2sts
@@ -1316 +1320 @@
         """
         
-        # FIXME (Ole): These tests should really move to 
-        # test_generic_boundaries.py
-        
-        from anuga.shallow_water import Domain
-        from anuga.shallow_water import Reflective_boundary
-        from anuga.shallow_water import Dirichlet_boundary
-        from anuga.shallow_water import File_boundary
-        from anuga.pmesh.mesh_interface import create_mesh_from_regions
-
         bounding_polygon=[[6.0,97.0],[6.01,97.0],[6.02,97.0],[6.02,97.02],[6.00,97.02]]
         tide = 0.37
@@ -1458 +1453 @@
         import warnings
         warnings.simplefilter('ignore')
-        
-        from anuga.shallow_water import Domain
-        from anuga.shallow_water import Reflective_boundary
-        from anuga.shallow_water import Dirichlet_boundary
-        from anuga.shallow_water import File_boundary
-        from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
         bounding_polygon=[[6.0,97.0],[6.01,97.0],[6.02,97.0],
@@ -1605 +1594 @@
         import warnings
         warnings.simplefilter('ignore')
-        
-        from anuga.shallow_water import Domain
-        from anuga.shallow_water import Reflective_boundary
-        from anuga.shallow_water import Dirichlet_boundary
-        from anuga.shallow_water import File_boundary
-        from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
         bounding_polygon=[[6.0,97.0],[6.01,97.0],[6.02,97.0],
@@ -1723 +1706 @@
          the correct order).
          """
-         
-        from anuga.shallow_water import Domain
-        from anuga.shallow_water import Reflective_boundary
-        from anuga.shallow_water import Dirichlet_boundary
-        from anuga.shallow_water import File_boundary
-        from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
         bounding_polygon=[[6.01,97.0],[6.02,97.0],[6.02,97.02],[6.00,97.02],[6.0,97.0]]
@@ -1831 +1808 @@
         Read correct points from ordering file and apply sts to boundary
         """
-        from anuga.shallow_water import Domain
-        from anuga.shallow_water import Reflective_boundary
-        from anuga.shallow_water import Dirichlet_boundary
-        from anuga.shallow_water import File_boundary
-        from anuga.pmesh.mesh_interface import create_mesh_from_regions
 
         lat_long_points=[[6.01,97.0],[6.02,97.0],[6.05,96.9],[6.0,97.0]]
@@ -1859 +1831 @@
                                            ua=ua,
                                            va=va)
+        # base name will not exist, but 3 other files are created
 
         # Write order file
@@ -1886 +1859 @@
         self.delete_mux(files)
 
-        assert(os.access(base_name, os.R_OK))
+        assert(os.access(sts_file+'.sts', os.F_OK))
 
         boundary_polygon = create_sts_boundary(base_name)
@@ -1979 +1952 @@
         #assert allclose(domain_drchlt.quantities['stage'].vertex_values[6], 2)        
         #assert allclose(domain_fbound.quantities['stage'].vertex_values[6], 2)
-        
-        
 
         try:
             os.remove(sts_file+'.sts')
-        except:
+        except IOError:
             # Windoze can't remove this file for some reason 
             pass