Ver código fonte

testsuite + doxygen: update for https://trac.osgeo.org/grass/changeset/63830

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63954 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 anos atrás
pai
commit
8553661e6b
2 arquivos alterados com 8 adições e 8 exclusões
  1. 2 2
      lib/gis/gislib.dox
  2. 6 6
      lib/gis/testsuite/gis_lib_env_test.py

+ 2 - 2
lib/gis/gislib.dox

@@ -269,11 +269,11 @@ above.</B>
 These routines look up the variable <em>name</em> in the GRASS
 environment and return its value (which is a character string). If
 <em>name</em> is not set, G_getenv() issues an error message and calls
-exit(). G__setenv() just returns the NULL pointer.
+exit(). G_setenv_nogisrc() just returns the NULL pointer.
 
  - G_setenv()
 
- - G__setenv()
+ - G_setenv_nogisrc()
   
 These routines set the the GRASS environment variable <em>name</em> to
 <em>value</em>. If <em>value</em> is NULL, the <em>name</em> is unset.

+ 6 - 6
lib/gis/testsuite/gis_lib_env_test.py

@@ -21,7 +21,7 @@ class GisLibraryTestEnv(TestCase):
         self.assertEqual(value, "A")
         
         # In memory management
-        libgis.G__setenv("TEST", "B");
+        libgis.G_setenv_nogisrc("TEST", "B");
 
         value = libgis.G__getenv("TEST")
         self.assertEqual(value, "B")
@@ -35,12 +35,12 @@ class GisLibraryTestEnv(TestCase):
         self.assertEqual(value, "A")
 
     def test_switch_env(self):
-        libgis.G__setenv("TEST", "SWITCH");
-        libgis.G__setenv2("TEST", "SWITCH2", libgis.G_VAR_MAPSET);
+        libgis.G_setenv_nogisrc("TEST", "SWITCH");
+        libgis.G_setenv_nogisrc2("TEST", "SWITCH2", libgis.G_VAR_MAPSET);
         # Create alternative env
         libgis.G_create_alt_env()
-        libgis.G__setenv("TEST", "TARGET");
-        libgis.G__setenv2("TEST", "TARGET2", libgis.G_VAR_MAPSET);
+        libgis.G_setenv_nogisrc("TEST", "TARGET");
+        libgis.G_setenv_nogisrc2("TEST", "TARGET2", libgis.G_VAR_MAPSET);
         value = libgis.G_getenv("TEST")
         self.assertEqual(value, "TARGET")
         value = libgis.G_getenv2("TEST", libgis.G_VAR_MAPSET)
@@ -58,7 +58,7 @@ class GisLibraryTestEnv(TestCase):
         value = libgis.G_getenv2("TEST", libgis.G_VAR_MAPSET)
         self.assertEqual(value, "C")
  
-        libgis.G__setenv2("TEST", "D", libgis.G_VAR_MAPSET);
+        libgis.G_setenv_nogisrc2("TEST", "D", libgis.G_VAR_MAPSET);
         value = libgis.G__getenv2("TEST", libgis.G_VAR_MAPSET)
         self.assertEqual(value, "D")
         # Force reading