Changeset 9213

Timestamp:

Jun 23, 2014, 7:11:39 PM (10 years ago)

Author:

steve

Message:

Adding in some test_all.py

Location:

trunk/anuga_core/source/anuga

Files:

• alpha_shape/test_all.py (added)
• caching/test_all.py (added)
• coordinate_transforms/test_all.py (added)
• culvert_flows/test_all.py (modified) (1 diff)
• geometry/polygon.py (modified) (2 diffs)
• geometry/test_polygon.py (modified) (1 diff)
• shallow_water/shallow_water_domain.py (modified) (2 diffs)
• utilities/plot_utils.py (modified) (1 diff)

trunk/anuga_core/source/anuga/culvert_flows/test_all.py

@@ -11 +11 @@
 import unittest
 import os
-import sys
-import tempfile
-import time
-import anuga.utilities.system_tools as aust
-from anuga.utilities.terminal_width import terminal_width
 
 
 #List files that should be excluded from the testing process.
 #E.g. if they are known to fail and under development
-exclude_files = []
-
-# Directories that should not be searched for test files.
-exclude_dirs = ['pypar_dist',  'shallow_water_balanced',   # Special requirements
-                '.svn',          # subversion
-                'props', 'wcprops', 'prop-base', 'text-base', 'tmp']
-
-
-def list_names(names, func=None, col_width=None, page_width=None):
-    # set defaults
-    p_width = page_width - 1            # set page width
-    if p_width is None:
-        p_width = 132                   # default page width
-
-    c_width = col_width                 # set column width
-    if c_width is None:
-        c_width = 0
-        for name in names:
-            if func:
-                name = func(name)
-            c_width = max(c_width, len(name))
-    c_width += 2                        # 2 column padding
-
-    # calculate number of columns allowed
-    max_columns = int(p_width / c_width)
-
-    # print columns
-    column = 0
-    for name in names:
-        if func:
-            name = func(name)
-        print '%-*s' % (c_width-1, name),
-        column += 1
-        if column >= max_columns:
-            column = 0
-            print
-
-    # if last line not finished, end it here
-    if column > 0:
-        print
+exclude = [] 
 
 
 def get_test_files(path):
-    walk = os.walk(path)
 
+    import sys
+
+    files = os.listdir(path)
+
+    #Check sub directories
     test_files = []
-    path_files = []
-
-    for (dirpath, dirnames, filenames) in walk:
-        # exclude forbidden directories
-        for e_dir in exclude_dirs:
-            try:
-                dirnames.remove(e_dir)
-            except ValueError:
-                pass
-
-        # check for test_*.py files
-        for filename in filenames:
-            if filename.startswith('test_') and filename.endswith('.py'):
-                test_files.append(filename)
-                if dirpath not in path_files:
-                    path_files.append(dirpath)
-
-    return test_files, path_files
+    for file in files:
+        if os.path.isdir(file):
+            sys.path.append(file)
+            #print 'Recursing into', file
+            test_files += get_test_files(path + os.sep + file)
+        elif file[:5] == 'test_' and file[-2:] == 'py':
+            #print 'Appending', file
+            test_files.append(file)
+        else:
+            pass
+    return test_files
 
 
-def regressionTest(test_verbose=False):
-    # start off with where we are
-    path = os.getcwd()
-    print
-    print 'Testing path: %s' % path
 
-    # get the terminal width
-    term_width = terminal_width()
-
-    # explain what we are doing
-    print
-    print "The following directories will be skipped over:"
-    exclude_dirs.sort()
-    list_names(exclude_dirs, page_width=term_width)
-
-    # get all test_*.py and enclosing directories
-    test_files, path_files = get_test_files(path)
-    path_files.sort()
-
-    files = [x for x in test_files if not x == 'test_all.py']
-    files.sort()        # Ensure same order on all platforms
-
-    print
-    print 'Paths searched:'
-    list_names(path_files, os.path.basename, page_width=term_width)
-
-    print    
-    print 'Files tested:'
-    list_names(files, page_width=term_width)
-    print
-
-    # update system path with found paths
-    for path in path_files:
-        sys.path.append(path)
-   
-    # exclude files that we can't handle 
-    for file in exclude_files:
-        print 'WARNING: File '+ file + ' to be excluded from testing'
-        try:
-            files.remove(file)
-        except ValueError, e:
-            msg = 'File "%s" was not found in test suite.\n' % file
-            msg += 'Original error is "%s"\n' % e
-            msg += 'Perhaps it should be removed from exclude list?'
-            raise Exception, msg
-
-    # import all test_*.py files
-    # NOTE: This implies that test_*.py files MUST HAVE UNIQUE NAMES!
-    filenameToModuleName = lambda f: os.path.splitext(f)[0]
-    moduleNames = map(filenameToModuleName, files)
-    modules = map(__import__, moduleNames)
-
-    # Fix up the system path
-    for file in path_files:
-        sys.path.remove(file)
-
-    # bundle up all the tests
-    load = unittest.defaultTestLoader.loadTestsFromModule
-    testCaseClasses = map(load, modules)
-
-    if test_verbose is True:
-        # Test the code by setting verbose to True.
-        # The test cases have to be set up for this to work.
-        # See test data manager for an example.
-        for test_suite in testCaseClasses:
-            for tests in test_suite._tests:
-                # tests is of class TestSuite
-                if len(tests._tests) > 1:
-                    # these are the test functions
-                    try:
-                        # Calls class method set_verbose in test case classes
-                        tests._tests[0].set_verbose()
-                    except:
-                        pass                # No all classes have set_verbose
-
-    return unittest.TestSuite(testCaseClasses)
+def regressionTest():
+    import sys, os, re, unittest
+    path = os.path.split(sys.argv[0])[0] or os.getcwd()
 
 
-def check_anuga_import():
-    try:
-        # importing something that loads quickly
-        import anuga.anuga_exceptions
-    except ImportError:
-        print "Python cannot import ANUGA module."
-        print "Check you have followed all steps of its installation."
-        import sys
-        sys.exit()
+    files = get_test_files(path)
 
 
+
+    #test = re.compile('^test_[\w]*.py$', re.IGNORECASE)
+    #files = filter(test.search, files)
+
+
+    try:
+        files.remove(__file__)  #Remove self from list (Ver 2.3. or later)
+    except:
+        files.remove('test_all.py')
+
+    print 'Testing:'
+    for file in files:
+        print '  ' + file
+
+    if globals().has_key('exclude'):
+        for file in exclude:
+            files.remove(file)
+            print 'WARNING: File '+ file + ' excluded from testing'
+
+
+    filenameToModuleName = lambda f: os.path.splitext(f)[0]
+    #print "files",files 
+    moduleNames = map(filenameToModuleName, files)
+    #print "moduleNames",moduleNames
+    modules = map(__import__, moduleNames)
+    load = unittest.defaultTestLoader.loadTestsFromModule
+    return unittest.TestSuite(map(load, modules))
+
 if __name__ == '__main__':
-    check_anuga_import()
 
-    if len(sys.argv) > 1 and sys.argv[1][0].upper() == 'V':
-        test_verbose = True
-        saveout = sys.stdout
-        filename = ".temp"
-        fid = open(filename, 'w')
-        sys.stdout = fid
-    else:
-        test_verbose = False
-    suite = regressionTest(test_verbose)
-    runner = unittest.TextTestRunner() #verbosity=2
+    from os import sep
+
+    #Attempt to compile all extensions
+    #execfile('..' + sep + 'utilities' + sep + 'compile.py')
+
+    #FIXME: Temporary measure
+    #os.chdir('..' + sep + 'utilities')
+    #execfile('compile.py')
+    #os.chdir('..' + sep + 'pyvolution')    
+    
+    #FIXME: Temporary measure
+    #os.chdir('..' + sep + 'triangle')
+    #execfile('compile.py')
+    #os.chdir('..' + sep + 'pyvolution')   
+    
+    #os.system('python compile.py') 
+
+    #print regressionTest()
+    #unittest.main(defaultTest='regressionTest')
+    
+    suite = regressionTest()
+    runner = unittest.TextTestRunner() #(verbosity=2)
     runner.run(suite)
-
-    # timestamp at the end
-    timestamp = time.asctime()
-    version = aust.get_revision_number()
-    print
-    print 'Finished at %s, version %s' % (timestamp, version)
-
-    # Cleaning up
-    if len(sys.argv) > 1 and sys.argv[1][0].upper() == 'V':
-        sys.stdout = saveout
-        #fid.close() # This was causing an error in windows
-        #os.remove(filename)
-
-    
-    if sys.platform == 'win32':
-        raw_input('Press the RETURN key')

trunk/anuga_core/source/anuga/geometry/polygon.py

@@ -723 +723 @@
     """
 
-    from pylab import ion, ioff, hold, plot, savefig, xlabel, \
-                      ylabel, title, close, title, fill
+
+    import matplotlib as mpl
+    mpl.use('Agg')
+    #import matplotlib.pyplot as plt
+        
+
+    from matplotlib.pyplot import hold, plot, savefig, xlabel, \
+                    ylabel, title, close, title, fill
 
     assert type(polygons_points) == list, \
                 'input must be a list of polygons and/or points'
 
-    ion()
+    #ion()
     hold(True)
 
@@ -777 +783 @@
         savefig('test_image')
 
-    ioff()
+    #ioff()
     hold(False)
     close('all')

trunk/anuga_core/source/anuga/geometry/test_polygon.py

@@ -1781 +1781 @@
         plot_polygons([polygon1, polygon2], figname='test1')
 
-        import pylab
-        pylab.close('all')
+
 
         # Another case
-        polygon3 = [[1,5], [10,1], [100,10], [50,10], [3,6]]
+        polygon3 = [[1,5], [10,1], [100,10], [50,9], [3,6]]
         plot_polygons([polygon2, polygon3], figname='test2')
 
-        pylab.close('all')
-
-        for file in ['test1.png', 'test2.png']:
-            assert os.access(file, os.R_OK)
-            os.remove(file)
+        #plt.close('all')
+
+        for plotfile in ['test1.png', 'test2.png']:
+            assert os.access(plotfile, os.R_OK)
+            os.remove(plotfile)
 
 

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1730 +1730 @@
         """
 
-        N = len(self) # Number_of_triangles
-        d = len(self.conserved_quantities)
 
         timestep = self.timestep
@@ -1747 +1745 @@
         Xmom = self.quantities['xmomentum']
         Ymom = self.quantities['ymomentum']
-        
-        #self.work_centroid_values[:] = Stage.centroid_values
-        
-        tff = self.tri_full_flag
-        
+
         Stage.update(timestep)
         Xmom.update(timestep)   
-        Ymom.update(timestep)   
-  
-        negative_ids = num.where( num.logical_and((Stage.centroid_values - Elev.centroid_values) < 0.0 , tff > 0) )[0]
-        
-        if len(negative_ids)>0:
-            #print 'NEGATIVE INDICES'
-            Stage.centroid_values[negative_ids] = Elev.centroid_values[negative_ids]
-            Xmom.centroid_values[negative_ids] = 0.0
-            Ymom.centroid_values[negative_ids] = 0.0          
+        Ymom.update(timestep) 
+        
+        if self.get_using_discontinuous_elevation():
+        
+            tff = self.tri_full_flag
+      
+            negative_ids = num.where( num.logical_and((Stage.centroid_values - Elev.centroid_values) < 0.0 , tff > 0) )[0]
             
-
-            # Note that Q.explicit_update is reset by compute_fluxes
-            # Where is Q.semi_implicit_update reset?
-            # It is reset in quantity_ext.c
-
+            if len(negative_ids)>0:
+                #print 'NEGATIVE INDICES'
+                Stage.centroid_values[negative_ids] = Elev.centroid_values[negative_ids]
+                Xmom.centroid_values[negative_ids] = 0.0
+                Ymom.centroid_values[negative_ids] = 0.0          
+
+            
 
 

trunk/anuga_core/source/anuga/utilities/plot_utils.py

@@ -978 +978 @@
     for myTSi in myTimeStep:
         if(verbose):
-            print myTSi
+            print 'Reduction = ', myTSi
         for output_quantity in output_quantities:
             if (verbose): print output_quantity