From cbe5a733a8c97c45ede0d75c80c4a854ed3d42a3 Mon Sep 17 00:00:00 2001
From: Olivier Chaussavoine <olivier.chaussavoine@gmail.com>
Date: Wed, 16 Apr 2014 07:59:31 +0200
Subject: [PATCH] test of volumes corrected

---
 src/test/py/run.py     |  7 ++++---
 src/test/py/test_ti.py | 31 +++++++++++++------------------
 src/test/py/utilt.py   | 14 ++++++++++++++
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/test/py/run.py b/src/test/py/run.py
index 6d8441b..91b91c4 100755
--- a/src/test/py/run.py
+++ b/src/test/py/run.py
@@ -34,6 +34,7 @@
 import molet
 import utilt
 import test_ti
+import test_volume
 import sys
 
 PARLEN=80
@@ -42,7 +43,7 @@
 def tests_tu(options):
     titre_test = "UNDEFINED"  
     
-    curdir,sqldir,resultsdir,expecteddir = test_ti.get_paths()
+    curdir,sqldir,resultsdir,expecteddir = utilt.get_paths()
 
     try:
         utilt.wait_for_true(srvob_conf.dbBO,0.1,"SELECT value=102,value FROM market.tvar WHERE name='OC_CURRENT_PHASE'",
@@ -140,8 +141,8 @@ def main():
     parser.add_option("-b","--build",dest="build",type="int",help="generates random test cases for test_ti",default=0)
     parser.add_option("-i","--ti",action="store_true",dest="test_ti",help="execute test_ti",default=False)
     parser.add_option("-r","--reset",action="store_true",dest="test_ti_reset",help="clean before execution test_ti",default=False)
-    #parser.add_option("-x","--x",dest="cst",type="int",help="test",default=1)
-    
+
+   
     (options, args) = parser.parse_args()
 
     # um = os.umask(0177) # u=rw,g=,o=
diff --git a/src/test/py/test_ti.py b/src/test/py/test_ti.py
index fd349e2..9fe3682 100644
--- a/src/test/py/test_ti.py
+++ b/src/test/py/test_ti.py
@@ -16,17 +16,7 @@
 
 PARLEN=80
 prtest = utilt.PrTest(PARLEN,'=')
-
-def get_paths():
-    curdir = os.path.abspath(__file__)
-    curdir = os.path.dirname(curdir)
-    curdir = os.path.dirname(curdir)
-    sqldir = os.path.join(curdir,'sql')
-    resultsdir,expecteddir = os.path.join(curdir,'results'),os.path.join(curdir,'expected')
-    molet.mkdir(resultsdir,ignoreWarning = True)
-    molet.mkdir(expecteddir,ignoreWarning = True)
-    tup = (curdir,sqldir,resultsdir,expecteddir)
-    return tup    
+   
 
 import random
 import csv
@@ -40,7 +30,7 @@ def build_ti(options):
     #print options.build
     #return
     #conf = srvob_conf.dbBO
-    curdir,sqldir,resultsdir,expecteddir = get_paths()
+    curdir,sqldir,resultsdir,expecteddir = utilt.get_paths()
     _frs = os.path.join(sqldir,'test_ti.csv')
 
     MAX_OWNER = 10
@@ -80,7 +70,7 @@ def test_ti(options):
 
     _reset,titre_test = options.test_ti_reset,''
 
-    curdir,sqldir,resultsdir,expecteddir = get_paths()
+    curdir,sqldir,resultsdir,expecteddir = utilt.get_paths()
     prtest.title('running test_ti on database "%s"' % (srvob_conf.DB_NAME,))
 
     dump = utilt.Dumper(srvob_conf.dbBO,options,None)
@@ -265,16 +255,21 @@ def check_values(inst,values_input,user):
     
     _errs = 0
     for qua,vin in values_input.iteritems():
-        vexpect = values_output.get(qua,0)+values_remain.get(qua,0)
-        if vin != vexpect:
-            print qua,vin,values_output.get(qua,0),values_remain.get(qua,0)
+        _out = values_output.get(qua,None)
+        _remain = values_remain.get(qua,None)
+        if _out is None or _remain is None:
+            _errs += 1
+            continue
+
+        if vin != (_out+ _remain):
+            print qua,vin,_out,_remain
             _errs += 1
-    # print '%i errors'% _errs
+
     return _errs
 
 def test_ti_old(options):
 
-    curdir,sqldir,resultsdir,expecteddir = get_paths()
+    curdir,sqldir,resultsdir,expecteddir = utilt.get_paths()
     prtest.title('running test_ti on database "%s"' % (srvob_conf.DB_NAME,))
 
     dump = utilt.Dumper(srvob_conf.dbBO,options,None)
diff --git a/src/test/py/utilt.py b/src/test/py/utilt.py
index e3d2e63..3121063 100644
--- a/src/test/py/utilt.py
+++ b/src/test/py/utilt.py
@@ -2,6 +2,20 @@
 import string
 import os.path
 import time, sys
+import molet
+
+
+def get_paths():
+    curdir = os.path.abspath(__file__)
+    curdir = os.path.dirname(curdir)
+    curdir = os.path.dirname(curdir)
+    sqldir = os.path.join(curdir,'sql')
+    resultsdir,expecteddir = os.path.join(curdir,'results'),os.path.join(curdir,'expected')
+    molet.mkdir(resultsdir,ignoreWarning = True)
+    molet.mkdir(expecteddir,ignoreWarning = True)
+    tup = (curdir,sqldir,resultsdir,expecteddir)
+    return tup 
+
 '''---------------------------------------------------------------------------
 ---------------------------------------------------------------------------'''
 class PrTest(object):