[GRASS-SVN] r71857 - in grass/trunk/gui/wxpython/core: . testsuite/data

[svn_grass at osgeo.org]

Author: annakrat
Date: 2017-11-27 16:07:47 -0800 (Mon, 27 Nov 2017)
New Revision: 71857

Modified:
   grass/trunk/gui/wxpython/core/testsuite/data/test_toolboxes_menudata_ref.xml
   grass/trunk/gui/wxpython/core/toolboxes.py
Log:
wxGUI/toolboxes: fix tests to reflect recent changes

Modified: grass/trunk/gui/wxpython/core/testsuite/data/test_toolboxes_menudata_ref.xml
===================================================================
--- grass/trunk/gui/wxpython/core/testsuite/data/test_toolboxes_menudata_ref.xml	2017-11-27 23:42:23 UTC (rev 71856)
+++ grass/trunk/gui/wxpython/core/testsuite/data/test_toolboxes_menudata_ref.xml	2017-11-28 00:07:47 UTC (rev 71857)
@@ -3,20 +3,33 @@
 <menudata>
   <menubar>
     <menu>
-      <label>Region</label>
+      <label>Computational region</label>
       <items>
         <menuitem>
-          <label>Display region</label>
+          <label>Show current region</label>
           <command>g.region -p</command>
-          <help>Manages the boundary definitions for the geographic region.</help>
+          <help>Shows the extent and resolution of the computational region.</help>
           <keywords>general,settings</keywords>
           <handler>RunMenuCmd</handler>
         </menuitem>
         <menuitem>
+          <label>Show region using latitude and longitude</label>
+          <command>g.region -pl</command>
+          <help>Shows the extent and resolution of the computational region.</help>
+          <keywords>general,settings</keywords>
+          <handler>RunMenuCmd</handler>
+        </menuitem>
+        <menuitem>
+          <label>Show current region extent in Map Display</label>
+          <handler>OnShowRegionExtent</handler>
+          <help>Shows the extent of the computational region in Map Display.</help>
+          <keywords>general,settings</keywords>
+        </menuitem>
+        <menuitem>
           <label>Set region</label>
           <command>g.region</command>
           <help>Manages the boundary definitions for the geographic region.</help>
-          <keywords>general,settings</keywords>
+          <keywords>general,settings,computational region,extent,resolution,level1</keywords>
           <handler>OnMenuCmd</handler>
         </menuitem>
       </items>
@@ -28,7 +41,7 @@
           <label>Set region</label>
           <command>g.region</command>
           <help>Manages the boundary definitions for the geographic region.</help>
-          <keywords>general,settings</keywords>
+          <keywords>general,settings,computational region,extent,resolution,level1</keywords>
           <handler>OnMenuCmd</handler>
         </menuitem>
         <separator />
@@ -64,7 +77,7 @@
           <label>Convert coordinates</label>
           <command>m.proj</command>
           <help>Converts coordinates from one projection to another (cs2cs frontend).</help>
-          <keywords>miscellaneous,projection</keywords>
+          <keywords>miscellaneous,projection,transformation</keywords>
           <handler>OnMenuCmd</handler>
         </menuitem>
       </items>
@@ -76,7 +89,7 @@
           <label>Set region</label>
           <command>g.region</command>
           <help>Manages the boundary definitions for the geographic region.</help>
-          <keywords>general,settings</keywords>
+          <keywords>general,settings,computational region,extent,resolution,level1</keywords>
           <handler>OnMenuCmd</handler>
         </menuitem>
       </items>

Modified: grass/trunk/gui/wxpython/core/toolboxes.py
===================================================================
--- grass/trunk/gui/wxpython/core/toolboxes.py	2017-11-27 23:42:23 UTC (rev 71856)
+++ grass/trunk/gui/wxpython/core/toolboxes.py	2017-11-28 00:07:47 UTC (rev 71857)
@@ -624,13 +624,13 @@
     ...                         '</items>')
     >>> _expandRuntimeModules(tree)
     >>> etree.tostring(tree)
-    '<items><module-item name="g.region"><module>g.region</module><description>Manages the boundary definitions for the geographic region.</description><keywords>general,settings</keywords></module-item></items>'
+    '<items><module-item name="g.region"><module>g.region</module><description>Manages the boundary definitions for the geographic region.</description><keywords>general,settings,computational region,extent,resolution,level1</keywords></module-item></items>'
     >>> tree = etree.fromstring('<items>'
     ...                         '<module-item name="m.proj"></module-item>'
     ...                         '</items>')
     >>> _expandRuntimeModules(tree)
     >>> etree.tostring(tree)
-    '<items><module-item name="m.proj"><module>m.proj</module><description>Converts coordinates from one projection to another (cs2cs frontend).</description><keywords>miscellaneous,projection</keywords></module-item></items>'
+    '<items><module-item name="m.proj"><module>m.proj</module><description>Converts coordinates from one projection to another (cs2cs frontend).</description><keywords>miscellaneous,projection,transformation</keywords></module-item></items>'
     """
     hasErrors = False
     modules = node.findall('.//module-item')