fix r.profile and g.remove test after renaming options

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63659 15284696-431f-4ddb-bdfa-cd5b030d7da7

general/g.remove/testsuite/test_g_remove.py

@@ -8,17 +8,17 @@ from grass.gunittest.gutils import get_current_mapset
 from grass.gunittest.gmodules import SimpleModule
 
 # when used user1 must be replaced by current mapset
-REMOVE_RASTERS = """rast/test_map_0@user1
-rast/test_map_1@user1
-rast/test_map_2@user1
-rast/test_map_3@user1
-rast/test_map_4@user1
-rast/test_map_5@user1
-rast/test_map_6@user1
-rast/test_map_7@user1
-rast/test_map_8@user1
-rast/test_map_9@user1
-rast/test_two@user1
+REMOVE_RASTERS = """raster/test_map_0@user1
+raster/test_map_1@user1
+raster/test_map_2@user1
+raster/test_map_3@user1
+raster/test_map_4@user1
+raster/test_map_5@user1
+raster/test_map_6@user1
+raster/test_map_7@user1
+raster/test_map_8@user1
+raster/test_map_9@user1
+raster/test_two@user1
 """
 
 REMOVING_RASTERS_LOG = """Removing raster <test_map_0>
@@ -79,9 +79,9 @@ class GMRemoveTest(grass.gunittest.TestCase):
                               exclude="*_small")
         self.assertModule(module)
         self.assertMultiLineEqual(module.outputs.stdout,
-                                  'rast/test_apples@user1\n'
-                                  'rast/test_apples_big@user1\n'
-                                  'rast/test_oranges@user1\n'.replace(
+                                  'raster/test_apples@user1\n'
+                                  'raster/test_apples_big@user1\n'
+                                  'raster/test_oranges@user1\n'.replace(
                                       'user1', get_current_mapset()))
         module = SimpleModule('g.remove', type='raster',
                               pattern='test_{apples,oranges}{_small,_big,*}',

lib/gis/renamed_options

@@ -340,6 +340,8 @@ r.out.vrml|exag:exaggeration
 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

raster/r.profile/testsuite/test_profile_ncspm.py

@@ -170,7 +170,7 @@ class TestProfileNCSPM(TestCase):
         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)