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

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Feb 17 15:41:43 PST 2013


Author: mic
Date: 2013-02-17 15:41:43 -0800 (Sun, 17 Feb 2013)
New Revision: 55093

Modified:
   grass-addons/grass7/raster/r.agent/libagent/grassland.py
   grass-addons/grass7/raster/r.agent/tests/test_grassland.py
Log:
cleanup grassland, prepare read/write

Modified: grass-addons/grass7/raster/r.agent/libagent/grassland.py
===================================================================
--- grass-addons/grass7/raster/r.agent/libagent/grassland.py	2013-02-17 23:08:11 UTC (rev 55092)
+++ grass-addons/grass7/raster/r.agent/libagent/grassland.py	2013-02-17 23:41:43 UTC (rev 55093)
@@ -48,7 +48,7 @@
         layer = garray.array()
         if grassmapname:
             self.grassmapnames[layername] = grassmapname
-        self.setlayer(layername, layer)
+        self.setlayer(layername, layer, force)
 
     def removelayer(self, layername):
         """
@@ -67,10 +67,10 @@
         @param string optional name of the GRASS map file to be created
         @param boolean optional, whether an existing file may be overwritten
         """
-        #TODO implement
         if self.layers.has_key(layername) and \
-          self.grassmapnames.has_key(layername):
-            grassmapname = self.grassmapnames[layername]
-            layer = self.layers[layername]
-            layer.write(grassmapname, overwrite=force)
+                                    self.grassmapnames.has_key(layername):
+            if force:
+                force="force"
+            self.layers[layername].write(self.grassmapnames[layername],
+                                                        overwrite=force)
 

Modified: grass-addons/grass7/raster/r.agent/tests/test_grassland.py
===================================================================
--- grass-addons/grass7/raster/r.agent/tests/test_grassland.py	2013-02-17 23:08:11 UTC (rev 55092)
+++ grass-addons/grass7/raster/r.agent/tests/test_grassland.py	2013-02-17 23:41:43 UTC (rev 55093)
@@ -7,7 +7,8 @@
 from grass.script import array as garray
 
 class TestGrassLand(unittest.TestCase):
-    def setUp(self):              
+    def setUp(self):
+        self.layername = "r.agent.testmap"
         self.pg = grassland.GrassLand()
 
     def test_getregion(self):
@@ -16,6 +17,7 @@
 
     def test_setregion(self):
         #TODO should not be required here.. maybe "resetregion()"?
+        # is set in constructor
         pass
 
     def test_getbound(self):
@@ -27,7 +29,7 @@
         ew = self.pg.region["ewres"]
         r = self.pg.region["rows"]
         c = self.pg.region["cols"]
-                            
+
         self.assertIsNotNone(n)
         self.assertIsNotNone(s)
         self.assertIsNotNone(w)
@@ -39,11 +41,28 @@
         self.assertEqual((e-w)/ew, c)
 
     def test_setlayer(self):
-       # gets tested in createlayer and super()/Playground
+        # gets tested in createlayer and super()/Playground
         pass
 
     def test_setgrasslayer(self):
-        #TODO better test manually?
+        # only do this test, if self.layername is set
+#        if self.layername:
+#            layer = garray.array()
+#            retval = layer.write(self.layername)
+#            if retval == 1:
+#                print "We need a file to play with in this test, but it"
+#                print "seems to exist already: '" + self.layername + "'"
+#                self.assertTrue(False)
+#            self.pg.setgrasslayer(self.layername, self.layername)
+#                print "GRASS map layer is already set.."
+#            self.pg.setgrasslayer(self.layername, self.layername)
+#                print "GRASS map layer was set but no error occured"
+#            if not ( self.layers.has_key(self.layername) and \
+#                        self.grassmapnames.has_key(self.layername) ):
+#                print "GRASS map layer was set but seems missing"
+#                self.assertTrue(False)
+#            self.pg.setgrasslayer(self.layername, self.layername, True)
+#            cleanup..
         pass
 
     def test_createlayer(self):
@@ -61,12 +80,11 @@
         self.pg.layers["foo"] = [0]
         self.pg.grassmapnames["foo"] = "foo"
         self.assertTrue(self.pg.layers.has_key("foo"))
-        self.pg.removelayer("foo")             
+        self.pg.removelayer("foo")
         self.assertFalse(self.pg.layers.has_key("foo"))
         self.assertFalse(self.pg.grassmapnames.has_key("foo"))
 
     def test_writelayer(self):
-        #TODO better test manually?
         pass
 
 #    def tearDown(self):



More information about the grass-commit mailing list