[GRASS-SVN] r63659 - in grass/trunk: general/g.remove/testsuite lib/gis raster/r.profile/testsuite

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-12-21 15:44:34 -0800 (Sun, 21 Dec 2014)
New Revision: 63659

Modified:
   grass/trunk/general/g.remove/testsuite/test_g_remove.py
   grass/trunk/lib/gis/renamed_options
   grass/trunk/raster/r.profile/testsuite/test_profile_ncspm.py
Log:
fix r.profile and g.remove test after renaming options

Modified: grass/trunk/general/g.remove/testsuite/test_g_remove.py
===================================================================
--- grass/trunk/general/g.remove/testsuite/test_g_remove.py	2014-12-21 11:14:49 UTC (rev 63658)
+++ grass/trunk/general/g.remove/testsuite/test_g_remove.py	2014-12-21 23:44:34 UTC (rev 63659)
@@ -8,17 +8,17 @@
 from grass.gunittest.gmodules import SimpleModule
 
 # when used user1 must be replaced by current mapset
-REMOVE_RASTERS = """rast/test_map_0 at user1
-rast/test_map_1 at user1
-rast/test_map_2 at user1
-rast/test_map_3 at user1
-rast/test_map_4 at user1
-rast/test_map_5 at user1
-rast/test_map_6 at user1
-rast/test_map_7 at user1
-rast/test_map_8 at user1
-rast/test_map_9 at user1
-rast/test_two at user1
+REMOVE_RASTERS = """raster/test_map_0 at user1
+raster/test_map_1 at user1
+raster/test_map_2 at user1
+raster/test_map_3 at user1
+raster/test_map_4 at user1
+raster/test_map_5 at user1
+raster/test_map_6 at user1
+raster/test_map_7 at user1
+raster/test_map_8 at user1
+raster/test_map_9 at user1
+raster/test_two at user1
 """
 
 REMOVING_RASTERS_LOG = """Removing raster <test_map_0>
@@ -79,9 +79,9 @@
                               exclude="*_small")
         self.assertModule(module)
         self.assertMultiLineEqual(module.outputs.stdout,
-                                  'rast/test_apples at user1\n'
-                                  'rast/test_apples_big at user1\n'
-                                  'rast/test_oranges at user1\n'.replace(
+                                  'raster/test_apples at user1\n'
+                                  'raster/test_apples_big at user1\n'
+                                  'raster/test_oranges at user1\n'.replace(
                                       'user1', get_current_mapset()))
         module = SimpleModule('g.remove', type='raster',
                               pattern='test_{apples,oranges}{_small,_big,*}',

Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2014-12-21 11:14:49 UTC (rev 63658)
+++ grass/trunk/lib/gis/renamed_options	2014-12-21 23:44:34 UTC (rev 63659)
@@ -340,6 +340,8 @@
 r.param.scale|s_tol:slope_tol
 r.param.scale|c_tol:curvature_tol
 r.param.scale|exp:exponent
+# r.profile
+r.profile|null:null_value
 # r.random
 r.random|raster_output:raster
 r.random|vector_output:vector

Modified: grass/trunk/raster/r.profile/testsuite/test_profile_ncspm.py
===================================================================
--- grass/trunk/raster/r.profile/testsuite/test_profile_ncspm.py	2014-12-21 11:14:49 UTC (rev 63658)
+++ grass/trunk/raster/r.profile/testsuite/test_profile_ncspm.py	2014-12-21 23:44:34 UTC (rev 63659)
@@ -170,7 +170,7 @@
         self.assertMultiLineEqual(rprofile.outputs.stdout.strip(), output2.strip())
 
     def test_profile_region(self):
-        rprofile = SimpleModule('r.profile', input='elevation', null='nodata',
+        rprofile = SimpleModule('r.profile', input='elevation', null_value='nodata',
                                 coordinates=[644914, 224579, 644986,
                                              224627, 645091, 224549])
         self.assertModule(rprofile)