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

[brad at geodynamics.org]

Author: brad
Date: 2011-07-15 10:24:04 -0700 (Fri, 15 Jul 2011)
New Revision: 18770

Modified:
   cs/spatialdata/trunk/tests/pytests/spatialdb/TestCompositeDB.py
   cs/spatialdata/trunk/tests/pytests/spatialdb/gensimpledb.cfg
Log:
Fixed descriptive labels in python unit tests.

Modified: cs/spatialdata/trunk/tests/pytests/spatialdb/TestCompositeDB.py
===================================================================
--- cs/spatialdata/trunk/tests/pytests/spatialdb/TestCompositeDB.py	2011-07-15 17:04:26 UTC (rev 18769)
+++ cs/spatialdata/trunk/tests/pytests/spatialdb/TestCompositeDB.py	2011-07-15 17:24:04 UTC (rev 18770)
@@ -37,6 +37,7 @@
 
     from spatialdata.spatialdb.CompositeDB import CompositeDB
     db = CompositeDB()
+    db.inventory.label = "composite db"
     db.inventory.dbA = dbA
     db.inventory.namesA = ["two", "one"]
     db.inventory.dbB = dbB

Modified: cs/spatialdata/trunk/tests/pytests/spatialdb/gensimpledb.cfg
===================================================================
--- cs/spatialdata/trunk/tests/pytests/spatialdb/gensimpledb.cfg	2011-07-15 17:04:26 UTC (rev 18769)
+++ cs/spatialdata/trunk/tests/pytests/spatialdb/gensimpledb.cfg	2011-07-15 17:24:04 UTC (rev 18770)
@@ -26,32 +26,38 @@
 values.one.shapers.bg.default = 0.0
 values.one.shapers.bg.operand = add
 values.one.shapers.bg.db_value = One
+values.one.shapers.bg.db.label = DB1: background
 values.one.shapers.bg.db.query_type = linear
 values.one.shapers.bg.db.iohandler.filename = data/gen1Din2D_one_bg.spatialdb
 values.one.shapers.add.default = 1.0
 values.one.shapers.add.operand = add
 values.one.shapers.add.db_value = One
+values.one.shapers.add.db.label = DB1: add
 values.one.shapers.add.db.query_type = linear
 values.one.shapers.add.db.iohandler.filename = data/gen1Din2D_one_add.spatialdb
 values.one.shapers.multiply.default = 0.0
 values.one.shapers.multiply.operand = multiply
 values.one.shapers.multiply.db_value = One
+values.one.shapers.multiply.db.label = DB1: multiply
 values.one.shapers.multiply.db.query_type = linear
 values.one.shapers.multiply.db.iohandler.filename = data/gen1Din2D_one_multiply.spatialdb
 
 values.two.shapers.bg.default = -1.0
 values.two.shapers.bg.db_value = Two
 values.two.shapers.bg.operand = add
+values.two.shapers.bg.db.label = DB2: background
 values.two.shapers.bg.db.query_type = linear
 values.two.shapers.bg.db.iohandler.filename = data/gen1Din2D_two_bg.spatialdb
 values.two.shapers.subtract.default = 0.0
 values.two.shapers.subtract.operand = subtract
 values.two.shapers.subtract.db_value = Two
+values.two.shapers.subtract.db.label = DB2: subtract
 values.two.shapers.subtract.db.query_type = linear
 values.two.shapers.subtract.db.iohandler.filename = data/gen1Din2D_two_subtract.spatialdb
 values.two.shapers.divide.default = 1.0
 values.two.shapers.divide.operand = divide
 values.two.shapers.divide.db_value = Two
+values.two.shapers.divide.db.label = DB2: divide
 values.two.shapers.divide.db.query_type = linear
 values.two.shapers.divide.db.iohandler.filename = data/gen1Din2D_two_divide.spatialdb