[cig-commits] r8192 - cs/spatialdata-0.1/trunk/tests/pytests/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2007-10-29 09:31:18 -0700 (Mon, 29 Oct 2007)
New Revision: 8192

Modified:
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestGenSimpleDBApp.py
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSimpleIOAscii.py
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSpatialDB.py
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestUniformDB.py
Log:
Added calls to _configure() in Python unit tests to use default values.

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestGenSimpleDBApp.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestGenSimpleDBApp.py	2007-10-29 16:30:34 UTC (rev 8191)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestGenSimpleDBApp.py	2007-10-29 16:31:18 UTC (rev 8192)
@@ -24,19 +24,16 @@
     from spatialdata.spatialdb.generator.GenSimpleDBApp import GenSimpleDBApp
     from spatialdata.geocoords.CSCart import CSCart
     from spatialdata.spatialdb.SimpleDB import SimpleDB
-    from spatialdata.spatialdb.SimpleIOAscii import SimpleIOAscii
     
     app = GenSimpleDBApp()
     app.run()
 
     # Test write using query
-    from spatialdata.spatialdb.SimpleDB import SimpleDB
-    iohandler = SimpleIOAscii()
-    iohandler.filename = "data/gen1Din2D.spatialdb"
     db = SimpleDB()
+    db._configure()
+    db.iohandler.filename = "data/gen1Din2D.spatialdb"
     db.label = "test"
     db.queryType = "nearest"
-    db.iohandler = iohandler
     db.initialize()
 
     db.open()

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSimpleIOAscii.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSimpleIOAscii.py	2007-10-29 16:30:34 UTC (rev 8191)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSimpleIOAscii.py	2007-10-29 16:31:18 UTC (rev 8192)
@@ -48,12 +48,11 @@
 
     # Test write using query
     from spatialdata.spatialdb.SimpleDB import SimpleDB
-    iohandler = SimpleIOAscii()
-    iohandler.filename = filename
     db = SimpleDB()
+    db._configure()
     db.label = "test"
     db.queryType = "Linear"
-    db.iohandler = iohandler
+    db.iohandler.filename = filename
     db.initialize()
 
     db.open()

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSpatialDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSpatialDB.py	2007-10-29 16:30:34 UTC (rev 8191)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSpatialDB.py	2007-10-29 16:31:18 UTC (rev 8192)
@@ -19,15 +19,12 @@
 class TestSpatialDB(unittest.TestCase):
 
   def setUp(self):
-    from spatialdata.spatialdb.SimpleIOAscii import SimpleIOAscii
-    iohandler = SimpleIOAscii()
-    iohandler.filename = "data/spatialdb.dat"
-
     from spatialdata.spatialdb.SimpleDB import SimpleDB
     db = SimpleDB()
+    db._configure()
     db.label = "test"
     db.queryType = "Nearest"
-    db.iohandler = iohandler
+    db.iohandler.filename = "data/spatialdb.dat"
     db.initialize()
     self._db = db
     return

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestUniformDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestUniformDB.py	2007-10-29 16:30:34 UTC (rev 8191)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestUniformDB.py	2007-10-29 16:31:18 UTC (rev 8192)
@@ -20,7 +20,8 @@
   def setUp(self):
     from spatialdata.spatialdb.UniformDB import UniformDB
     db = UniformDB()
-    db.label = "test db"
+    db._configure()
+    db.label = "test"
     db.values = ["one", "two", "three"]
     db.data = [1.1, 2.2, 3.3]
     db.initialize()