Changeset 9566 for trunk/anuga_core/source/anuga/file/tests

Timestamp:

Jan 31, 2015, 11:47:13 PM (10 years ago)

Author:

steve

Message:

Changed test folders to tests and added testers to all the sub packages so that
you can do something like anuga.file.test()

Location:

trunk/anuga_core/source/anuga/file/tests

Files:

• test_csv.py (modified) (3 diffs)
• test_urs.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/file/tests/test_csv.py

@@ -229 +229 @@
         
         path = get_pathname_from_package('anuga.shallow_water')                
-        testfile = os.path.join(path, 'test', 'data', 'polygon_values_example.csv')                
+        testfile = os.path.join(path, 'tests', 'data', 'polygon_values_example.csv')                
 
         polygons, values = load_csv_as_polygons(testfile, 
@@ -306 +306 @@
         
         path = get_pathname_from_package('anuga.shallow_water')                
-        testfile = os.path.join(path, 'test', 'data', 'polygon_values_example.csv')                
+        testfile = os.path.join(path, 'tests', 'data', 'polygon_values_example.csv')                
 
         polygons, values = load_csv_as_polygons(testfile, 
@@ -386 +386 @@
         
         path = get_pathname_from_package('anuga.shallow_water')                
-        testfile = os.path.join(path, 'test', 'data', 'polygon_values_example.csv')                
+        testfile = os.path.join(path, 'tests', 'data', 'polygon_values_example.csv')                
 
         polygons, values = load_csv_as_building_polygons(testfile, 

trunk/anuga_core/source/anuga/file/tests/test_urs.py

@@ -74 +74 @@
         
     
-    def dave_test_URS_points_needed(self):
+    def in_development_URS_points_needed(self):
         ll_lat = -21.51667
         ll_long = 114.51667
@@ -89 +89 @@
                                   verbose=self.verbose)
         
-    def X_test_URS_points_neededII(self):
-        ll_lat = -21.5
-        ll_long = 114.5
-        grid_spacing = 1./60.
-        lat_amount = 30
-        long_amount = 30
-
-        # change this so lats and longs are inputed, then converted
-        
-        #boundary_polygon = [[7660000,250000],[7660000,280000],
-        #                     [7630000,280000],[7630000,250000]]
-        calculate_boundary_points(boundary_polygon, ll_lat, ll_long,
-                          grid_spacing, 
-                          lat_amount, long_amount,
-                          verbose=self.verbose)
         
     def test_URS_points_northern_hemisphere(self):
@@ -167 +152 @@
                 assert False
 
-    def covered_in_other_tests_test_URS_points_needed_poly1(self):
+    def in_development_URS_points_needed_poly1(self):
         # Values used for FESA 2007 results
         # domain in southern hemisphere zone 51        
@@ -194 +179 @@
 
 
-    def covered_in_other_tests_test_URS_points_needed_poly2(self):
+    def in_development_URS_points_needed_poly2(self):
         # Values used for 2004 validation work
         # domain in northern hemisphere zone 47