[GRASS-SVN] r53152 - in grass/trunk/temporal: t.rast.list t.topology

[svn_grass at osgeo.org]

Author: huhabla
Date: 2012-09-10 03:41:42 -0700 (Mon, 10 Sep 2012)
New Revision: 53152

Modified:
   grass/trunk/temporal/t.rast.list/test.t.rast.list.sh
   grass/trunk/temporal/t.topology/test.t.topology.reltime.sh
Log:
Fixed tests


Modified: grass/trunk/temporal/t.rast.list/test.t.rast.list.sh
===================================================================
--- grass/trunk/temporal/t.rast.list/test.t.rast.list.sh	2012-09-10 10:40:45 UTC (rev 53151)
+++ grass/trunk/temporal/t.rast.list/test.t.rast.list.sh	2012-09-10 10:41:42 UTC (rev 53152)
@@ -66,58 +66,53 @@
 EOF
 
 t.create --o type=strds temporaltype=absolute output=precip_abs0 title="A test with input files" descr="A test with input files"
-t.create --o type=strds temporaltype=absolute output=precip_abs1 title="A test with input files" descr="A test with input files"
-t.create --o type=strds temporaltype=absolute output=precip_abs2 title="A test with input files" descr="A test with input files"
-t.create --o type=strds temporaltype=absolute output=precip_abs3 title="A test with input files" descr="A test with input files"
-t.create --o type=strds temporaltype=absolute output=precip_abs4 title="A test with input files" descr="A test with input files"
-t.create --o type=strds temporaltype=absolute output=precip_abs5 title="A test with input files" descr="A test with input files"
 
 # The @test
-t.register type=rast -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
+t.register type=rast --o -i input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
 t.rast.list    fs=" | " method=comma     input=precip_abs0
-t.rast.list -h input=precip_abs1
+t.rast.list -h input=precip_abs0
 t.rast.list -h fs=" | " method=cols      input=precip_abs0
 t.rast.list -h fs=" | " method=delta     input=precip_abs0
 t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
 t.rast.list -h fs=" | " method=gran      input=precip_abs0
 
-t.register type=rast    input=precip_abs1 file="${n1}" start="2001-01-01" increment="1 months"
-t.rast.list    fs=" | " method=comma     input=precip_abs1
-t.rast.list -h input=precip_abs1
-t.rast.list -h fs=" | " method=cols      input=precip_abs1
-t.rast.list -h fs=" | " method=delta     input=precip_abs1
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs1
+t.register type=rast --o input=precip_abs0 file="${n1}" start="2001-01-01" increment="1 months"
+t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list -h input=precip_abs0
+t.rast.list -h fs=" | " method=cols      input=precip_abs0
+t.rast.list -h fs=" | " method=delta     input=precip_abs0
+t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
+# ERROR: no interval time   
+t.rast.list -h fs=" | " method=gran      input=precip_abs0
 
-t.register type=rast -i input=precip_abs2 file="${n2}" 
-t.rast.list    fs=" | " method=comma     input=precip_abs2
-t.rast.list -h input=precip_abs2
-t.rast.list -h fs=" | " method=cols      input=precip_abs2
-t.rast.list -h fs=" | " method=delta     input=precip_abs2
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs2
-t.rast.list -h fs=" | " method=gran      input=precip_abs2
+t.register type=rast --o -i input=precip_abs0 file="${n2}" 
+t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list -h input=precip_abs0
+t.rast.list -h fs=" | " method=cols      input=precip_abs0
+t.rast.list -h fs=" | " method=delta     input=precip_abs0
+t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
+# ERROR: no interval time   
+t.rast.list -h fs=" | " method=gran      input=precip_abs0
 
-t.register type=rast -i input=precip_abs3 file="${n3}"
-t.rast.list    fs=" | " method=comma     input=precip_abs3
-t.rast.list -h fs=" | " method=delta     input=precip_abs3
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs3
-t.rast.list -h fs=" | " method=gran      input=precip_abs3
+t.register type=rast --o -i input=precip_abs0 file="${n3}"
+t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list -h fs=" | " method=delta     input=precip_abs0
+t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
+t.rast.list -h fs=" | " method=gran      input=precip_abs0
 
-t.register type=rast -i input=precip_abs4 file="${n4}"
-t.rast.list    fs=" | " method=comma     input=precip_abs4
-t.rast.list -h fs=" | " method=delta     input=precip_abs4
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs4
-t.rast.list -h fs=" | " method=gran      input=precip_abs4
+t.register type=rast --o -i input=precip_abs0 file="${n4}"
+t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list -h fs=" | " method=delta     input=precip_abs0
+t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
+t.rast.list -h fs=" | " method=gran      input=precip_abs0
 
-t.register type=rast -i input=precip_abs5 file="${n5}"
-t.rast.list    fs=" | " method=comma     input=precip_abs5
-t.rast.list -h input=precip_abs5
-t.rast.list -h fs=" | " method=cols      input=precip_abs5
-t.rast.list -h fs=" | " method=delta     input=precip_abs5
-t.rast.list -h fs=" | " method=deltagaps input=precip_abs5
+t.register type=rast --o -i input=precip_abs0 file="${n5}"
+t.rast.list    fs=" | " method=comma     input=precip_abs0
+t.rast.list -h input=precip_abs0
+t.rast.list -h fs=" | " method=cols      input=precip_abs0
+t.rast.list -h fs=" | " method=delta     input=precip_abs0
+t.rast.list -h fs=" | " method=deltagaps input=precip_abs0
+t.rast.list -h fs=" | " method=gran      input=precip_abs0
 
-# @test of @failure, time instances and mixed time is not supported
-t.rast.list -h fs=" | " method=gran      input=precip_abs5
-t.rast.list -h fs=" | " method=gran      input=precip_abs1
-
 t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-t.remove type=strds input=precip_abs0,precip_abs1,precip_abs2,precip_abs3,precip_abs4,precip_abs5
+t.remove type=strds input=precip_abs0

Modified: grass/trunk/temporal/t.topology/test.t.topology.reltime.sh
===================================================================
--- grass/trunk/temporal/t.topology/test.t.topology.reltime.sh	2012-09-10 10:40:45 UTC (rev 53151)
+++ grass/trunk/temporal/t.topology/test.t.topology.reltime.sh	2012-09-10 10:41:42 UTC (rev 53152)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Tests the temporaly topology module of space time datasets 
+# Tests the temporal topology module of space time datasets 
 
 # We need to set a specific region in the
 # @preprocess step of this test.