[GRASS-SVN] r54672 - in grass-addons/grass7/raster/r.agent: libagent tests

[svn_grass at osgeo.org]

Author: mic
Date: 2013-01-16 06:13:16 -0800 (Wed, 16 Jan 2013)
New Revision: 54672

Modified:
   grass-addons/grass7/raster/r.agent/libagent/grassland.py
   grass-addons/grass7/raster/r.agent/libagent/playground.py
   grass-addons/grass7/raster/r.agent/tests/test_grassland.py
   grass-addons/grass7/raster/r.agent/tests/test_playground.py
Log:
add tests and move methods to upper class

Modified: grass-addons/grass7/raster/r.agent/libagent/grassland.py
===================================================================
--- grass-addons/grass7/raster/r.agent/libagent/grassland.py	2013-01-16 13:30:24 UTC (rev 54671)
+++ grass-addons/grass7/raster/r.agent/libagent/grassland.py	2013-01-16 14:13:16 UTC (rev 54672)
@@ -29,23 +29,26 @@
         """
         Put an existing map from GRASS to the layer collection
         @param string name of the layer
-        @param string name of a GRASS map layer
+        @param string name of an existing GRASS map layer
         @param boolean optional, whether to overwrite values if key exists
         """
         layer = garray.array()
-        if grassmapname:
-            # fill the new grass array with the contents from the file
-            layer.read(grassmapname)
-            self.grassmapnames[layername] = grassmapname
+        # fill the new grass array with the contents from the file
+        layer.read(grassmapname)
+        self.grassmapnames[layername] = grassmapname
         self.setlayer(layername, layer, force)
 
-    def createlayer(self, layername, force=False):
+    def createlayer(self, layername, grassmapname=False, force=False):
         """
         Create a new layer and add it to the layer collection
         @param string name of the layer
         @param string name of a GRASS map layer or False if layer is only local
+        @param boolean whether to overwrite an existing layer
         """
-        self.setgrasslayer(layername, False, force)
+        layer = garray.array()
+        if grassmapname:
+            self.grassmapnames[layername] = grassmapname
+        self.setlayer(layername, layer)
 
     def writelayer(self, layername, force=False):
         if self.layers.has_key(layername) and \

Modified: grass-addons/grass7/raster/r.agent/libagent/playground.py
===================================================================
--- grass-addons/grass7/raster/r.agent/libagent/playground.py	2013-01-16 13:30:24 UTC (rev 54671)
+++ grass-addons/grass7/raster/r.agent/libagent/playground.py	2013-01-16 14:13:16 UTC (rev 54672)
@@ -17,7 +17,8 @@
 
     def __init__(self):
         self.layers = dict()
-        self.region = dict(n=0,s=0,w=0,e=0)
+#TODO
+        self.region = dict(n=0,s=0,w=0,e=0,rows=0,cols=0)
 
     def getregion(self):
         """
@@ -53,7 +54,11 @@
         @param string name of the layer
         @param boolean whether to overwrite an existing layer
         """
-        pass
+        #TODO rows vs. cols
+        layer = []
+        for i in range(self.region["rows"]):
+            l.append( [[] for j in range(self.region["cols"])])
+        self.setlayer(layername, layer)
 
     def getlayer(self, layername):
         """

Modified: grass-addons/grass7/raster/r.agent/tests/test_grassland.py
===================================================================
--- grass-addons/grass7/raster/r.agent/tests/test_grassland.py	2013-01-16 13:30:24 UTC (rev 54671)
+++ grass-addons/grass7/raster/r.agent/tests/test_grassland.py	2013-01-16 14:13:16 UTC (rev 54672)
@@ -21,8 +21,9 @@
 # Enought if tested from Playground and e.g. setgrasslayer below..
 
     def test_createlayer(self):
-        #TODO
-        self.pg.createlayer("foo")
+        self.pg.createlayer("foo", "foo")
+        self.assertTrue(self.pg.layers.has_key("foo"))
+        self.assertTrue(self.pg.grassmapnames.has_key("foo"))
 
     def test_getlayer(self):
         self.pg.layers["foo"] = [0]

Modified: grass-addons/grass7/raster/r.agent/tests/test_playground.py
===================================================================
--- grass-addons/grass7/raster/r.agent/tests/test_playground.py	2013-01-16 13:30:24 UTC (rev 54671)
+++ grass-addons/grass7/raster/r.agent/tests/test_playground.py	2013-01-16 14:13:16 UTC (rev 54672)
@@ -29,8 +29,9 @@
         self.assertIs(self.pg.layers[key], layer)
 
     def test_createlayer(self):
-        #TODO
         self.pg.createlayer("foo")
+        self.assertTrue(self.pg.layers.has_key("foo"))
+        #TODO rows / cols
 
     def test_getlayer(self):
         self.pg.layers["foo"] = [0]