Changeset 6494 for anuga_core/source

Timestamp:

Mar 11, 2009, 5:01:21 PM (16 years ago)

Author:

ole

Message:

Fixed up tests.
Original problem in ticket:314 is still present, though.

File:

• anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py (modified) (9 diffs)

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -2 +2 @@
 
 import unittest, os
+from os.path import join
+
 from math import pi, sqrt
 import tempfile
@@ -14 +16 @@
 from anuga.geospatial_data.geospatial_data import Geospatial_data
 from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
+from anuga.utilities.system_tools import get_pathname_from_package
 from shallow_water_domain import *
 
@@ -6544 +6547 @@
         from anuga.geospatial_data.geospatial_data import Geospatial_data
 
-
+        
+        # Get path where this test is run
+        path = get_pathname_from_package('anuga.shallow_water')        
+        
+        
         #----------------------------------------------------------------------
         # Create domain
@@ -6589 +6596 @@
             interior_regions.append( [polygon, 100] ) 
 
-        meshname = 'offending_mesh.msh'
+        meshname = join(path, 'offending_mesh.msh')
         create_mesh_from_regions(bounding_polygon,
                                  boundary_tags={'south': [0], 'east': [1], 'north': [2], 'west': [3]},
@@ -6605 +6612 @@
         #----------------------------------------------------------------------
 
-        points_file = 'offending_point.pts'
+        points_file = join(path, 'offending_point.pts')
 
         # Offending point
@@ -6641 +6648 @@
         
         
-    def Xtest_fitting_example_that_crashed_2(self):
+    def test_fitting_example_that_crashed_2(self):
         """test_fitting_example_that_crashed_2
         
@@ -6655 +6662 @@
         verbose = False        
 
-        from os.path import join
         from anuga.shallow_water import Domain
         from anuga.pmesh.mesh_interface import create_mesh_from_regions
         from anuga.geospatial_data import Geospatial_data
-
-        meshname = 'test_mesh.msh'
+        
+        # Get path where this test is run
+        path = get_pathname_from_package('anuga.shallow_water')        
+        
+
+        meshname = join(path, 'test_mesh.msh')
         W=304180
         S=6185270
@@ -6683 +6693 @@
         
         # Large test set revealed one problem
-        points_file = 'test_points_large.csv'
+        points_file = join(path, 'test_points_large.csv')
         try:
             domain.set_quantity('elevation', 
@@ -6699 +6709 @@
                             
         # Small test set revealed another problem
-        points_file = 'test_points_small.csv'    
+        points_file = join(path, 'test_points_small.csv')
         try:    
             domain.set_quantity('elevation',