temporal modules: Fixed algebra tests

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

temporal/t.rast.algebra/testsuite/test_raster_algebra.py

@@ -90,7 +90,7 @@ class TestTRastAlgebra(gunittest.TestCase):
     def test_simple_arith_hash_1(self):
         """Simple arithmetic test including the hash operator"""
        
-        self.assertModule("t.rast.algebra",  expression='R = A + A {#, equal,l} A', basename="r")
+        self.assertModule("t.rast.algebra",  expression='R = A + (A {#, equal,l} A)', basename="r")
 
         D = tgis.open_old_stds("R", type="strds")
         

temporal/t.rast.algebra/testsuite/test_raster_algebra_fails.py

@@ -31,12 +31,14 @@ class TestTRastAlgebraFails(gunittest.TestCase):
 
     def test_error_handling(self):        
         # Syntax error
-        self.assertModuleFail("t.rast.algebra",  expression="R == A {+,equal| precedes| follows,l} B", basename="r")
+        self.assertModuleFail("t.rast.algebra",  expression="R == A {+,equal| precedes| follows,l} B", 
+                                          basename="r")
         # No STRDS
         self.assertModuleFail("t.rast.algebra",  expression="R = NoSTRDS + NoSTRDS", basename="r")
         # No basename
         self.assertModuleFail("t.rast.algebra",  expression="R = A + B")
-
+        # Catch temporal lagebra expressions that are prohibited in the raster algebra
+        self.assertModuleFail("t.rast.algebra",  expression="R = strds(A) + strds(B)", basename="r")
 
 if __name__ == '__main__':
     gunittest.test()