[GRASS-SVN] r62306 - grass/trunk/vector/v.what/testsuite

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-10-20 08:13:09 -0700 (Mon, 20 Oct 2014)
New Revision: 62306

Modified:
   grass/trunk/vector/v.what/testsuite/test_vwhat_layers.py
   grass/trunk/vector/v.what/testsuite/test_vwhat_ncspm.py
Log:
v.what: fix tests - do not test database path

Modified: grass/trunk/vector/v.what/testsuite/test_vwhat_layers.py
===================================================================
--- grass/trunk/vector/v.what/testsuite/test_vwhat_layers.py	2014-10-20 15:12:27 UTC (rev 62305)
+++ grass/trunk/vector/v.what/testsuite/test_vwhat_layers.py	2014-10-20 15:13:09 UTC (rev 62306)
@@ -6,7 +6,7 @@
 North: 226193
 ------------------------------------------------------------------
 Map: test_vector 
-Mapset: vector_what
+Mapset: ...
 Type: Area
 Sq Meters: 633834.281
 Hectares: 63.383
@@ -27,7 +27,7 @@
 North: 226193
 ------------------------------------------------------------------
 Map: test_vector 
-Mapset: vector_what
+Mapset: ...
 Type: Area
 Sq Meters: 633834.281
 Hectares: 63.383
@@ -36,15 +36,15 @@
 Layer: 1
 Category: 2
 
-Driver: sqlite
-Database: /home/anna/grassdata/nc_spm_08_grass7_test/vector_what/sqlite/sqlite.db
+Driver: ...
+Database: ...
 Table: t1
 Key column: cat_
 Layer: 1
 Category: 1
 
-Driver: sqlite
-Database: /home/anna/grassdata/nc_spm_08_grass7_test/vector_what/sqlite/sqlite.db
+Driver: ...
+Database: ...
 Table: t1
 Key column: cat_
 cat_ : 1
@@ -53,15 +53,15 @@
 Layer: 2
 Category: 3
 
-Driver: sqlite
-Database: /home/anna/grassdata/nc_spm_08_grass7_test/vector_what/sqlite/sqlite.db
+Driver: ...
+Database: ...
 Table: t2
 Key column: cat_
 Layer: 2
 Category: 4
 
-Driver: sqlite
-Database: /home/anna/grassdata/nc_spm_08_grass7_test/vector_what/sqlite/sqlite.db
+Driver: ...
+Database: ...
 Table: t2
 Key column: cat_
 cat_ : 4
@@ -73,7 +73,7 @@
 North=226193
 
 Map=test_vector
-Mapset=vector_what
+Mapset=...
 Type=Area
 Sq_Meters=633834.281
 Hectares=63.383
@@ -81,14 +81,14 @@
 Sq_Miles=0.2447
 Layer=1
 Category=2
-Driver=sqlite
-Database=/home/anna/grassdata/nc_spm_08_grass7_test/vector_what/sqlite/sqlite.db
+Driver=...
+Database=...
 Table=t1
 Key_column=cat_
 Layer=1
 Category=1
-Driver=sqlite
-Database=/home/anna/grassdata/nc_spm_08_grass7_test/vector_what/sqlite/sqlite.db
+Driver=...
+Database=...
 Table=t1
 Key_column=cat_
 cat_=1
@@ -96,14 +96,14 @@
 number=6
 Layer=2
 Category=3
-Driver=sqlite
-Database=/home/anna/grassdata/nc_spm_08_grass7_test/vector_what/sqlite/sqlite.db
+Driver=...
+Database=...
 Table=t2
 Key_column=cat_
 Layer=2
 Category=4
-Driver=sqlite
-Database=/home/anna/grassdata/nc_spm_08_grass7_test/vector_what/sqlite/sqlite.db
+Driver=...
+Database=...
 Table=t2
 Key_column=cat_
 cat_=4
@@ -133,16 +133,16 @@
 
     def test_run(self):
         self.assertModule(self.vwhat)
-        self.assertMultiLineEqual(first=out1, second=self.vwhat.outputs.stdout)
+        self.assertLooksLike(reference=out1, actual=self.vwhat.outputs.stdout)
 
     def test_print_options(self):
         self.vwhat.flags['a'].value = True
         self.assertModule(self.vwhat)
-        self.assertMultiLineEqual(first=out2, second=self.vwhat.outputs.stdout)
+        self.assertLooksLike(reference=out2, actual=self.vwhat.outputs.stdout)
 
         self.vwhat.flags['g'].value = True
         self.assertModule(self.vwhat)
-        self.assertMultiLineEqual(first=out3, second=self.vwhat.outputs.stdout)
+        self.assertLooksLike(reference=out3, actual=self.vwhat.outputs.stdout)
 
 
 if __name__ == '__main__':

Modified: grass/trunk/vector/v.what/testsuite/test_vwhat_ncspm.py
===================================================================
--- grass/trunk/vector/v.what/testsuite/test_vwhat_ncspm.py	2014-10-20 15:12:27 UTC (rev 62305)
+++ grass/trunk/vector/v.what/testsuite/test_vwhat_ncspm.py	2014-10-20 15:13:09 UTC (rev 62306)
@@ -44,8 +44,8 @@
 Layer: 1
 Category: 231
 
-Driver: sqlite
-Database: /home/anna/grassdata/nc_spm_08_grass7_test/PERMANENT/sqlite/sqlite.db
+Driver: ...
+Database: ...
 Table: roadsmajor
 Key column: cat
 cat : 231
@@ -64,8 +64,8 @@
 Layer: 1
 Category: 96
 
-Driver: sqlite
-Database: /home/anna/grassdata/nc_spm_08_grass7_test/PERMANENT/sqlite/sqlite.db
+Driver: ...
+Database: ...
 Table: precip_30ynormals_3d
 Key column: cat
 cat : 96
@@ -97,8 +97,8 @@
 Layer: 1
 Category: 7168
 
-Driver: sqlite
-Database: /home/anna/grassdata/nc_spm_08_grass7_test/PERMANENT/sqlite/sqlite.db
+Driver: ...
+Database: ...
 Table: lakes
 Key column: cat
 cat : 7168
@@ -121,8 +121,8 @@
 Length=2321.407296
 Layer=1
 Category=231
-Driver=sqlite
-Database=/home/anna/grassdata/nc_spm_08_grass7_test/PERMANENT/sqlite/sqlite.db
+Driver=...
+Database=...
 Table=roadsmajor
 Key_column=cat
 cat=231
@@ -140,8 +140,8 @@
 Point_height=121.920000
 Layer=1
 Category=96
-Driver=sqlite
-Database=/home/anna/grassdata/nc_spm_08_grass7_test/PERMANENT/sqlite/sqlite.db
+Driver=...
+Database=...
 Table=precip_30ynormals_3d
 Key_column=cat
 cat=96
@@ -172,8 +172,8 @@
 Sq_Miles=0.0036
 Layer=1
 Category=7168
-Driver=sqlite
-Database=/home/anna/grassdata/nc_spm_08_grass7_test/PERMANENT/sqlite/sqlite.db
+Driver=...
+Database=...
 Table=lakes
 Key_column=cat
 cat=7168
@@ -223,16 +223,16 @@
     def test_print_options(self):
         self.vwhat.flags['a'].value = True
         self.assertModule(self.vwhat)
-        self.assertMultiLineEqual(first=out2, second=self.vwhat.outputs.stdout)
+        self.assertLooksLike(reference=out2, actual=self.vwhat.outputs.stdout)
 
         self.vwhat.flags['g'].value = True
         self.assertModule(self.vwhat)
-        self.assertMultiLineEqual(first=out3, second=self.vwhat.outputs.stdout)
+        self.assertLooksLike(reference=out3, actual=self.vwhat.outputs.stdout)
 
     def test_threshold(self):
         self.vwhat.inputs['distance'].value = 100
         self.assertModule(self.vwhat)
-        self.assertMultiLineEqual(first=out4, second=self.vwhat.outputs.stdout)
+        self.assertLooksLike(reference=out4, actual=self.vwhat.outputs.stdout)
 
 
 if __name__ == '__main__':