[Greater-commits] r3856 - trunk/GREAT-ERModel/test
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Dec 2 17:00:39 CET 2011
Author: aheinecke
Date: 2011-12-02 17:00:36 +0100 (Fri, 02 Dec 2011)
New Revision: 3856
Modified:
trunk/GREAT-ERModel/test/support_itter.py
trunk/GREAT-ERModel/test/support_testdata.py
trunk/GREAT-ERModel/test/test_graph.py
trunk/GREAT-ERModel/test/test_pb_worker.py
trunk/GREAT-ERModel/test/test_sessionmethods.py
trunk/GREAT-ERModel/test/test_xmlrpc_session.py
Log:
Fix tests with added volume parameter
Modified: trunk/GREAT-ERModel/test/support_itter.py
===================================================================
--- trunk/GREAT-ERModel/test/support_itter.py 2011-12-02 14:13:55 UTC (rev 3855)
+++ trunk/GREAT-ERModel/test/support_itter.py 2011-12-02 16:00:36 UTC (rev 3856)
@@ -166,6 +166,8 @@
'q_dist': s[10],
'v_val': s[11],
'v_dist': s[12],
+ 'vol_val': '0',
+ 'vol_dist': '0',
'l': s[13],
'd_val': s[14],
'd_dist': s[15]
Modified: trunk/GREAT-ERModel/test/support_testdata.py
===================================================================
--- trunk/GREAT-ERModel/test/support_testdata.py 2011-12-02 14:13:55 UTC (rev 3855)
+++ trunk/GREAT-ERModel/test/support_testdata.py 2011-12-02 16:00:36 UTC (rev 3856)
@@ -91,6 +91,8 @@
'q_dist': '2',
'v_val': s[5],
'v_dist': '2',
+ 'vol_val': '0',
+ 'vol_dist': '0',
'l': '1000.0',
'd_val': '0.75',
'd_dist': '0'
Modified: trunk/GREAT-ERModel/test/test_graph.py
===================================================================
--- trunk/GREAT-ERModel/test/test_graph.py 2011-12-02 14:13:55 UTC (rev 3855)
+++ trunk/GREAT-ERModel/test/test_graph.py 2011-12-02 16:00:36 UTC (rev 3856)
@@ -93,8 +93,8 @@
def test_graphintegritycheck_bifurcation(self):
"""Test graph integrity check: Root is bifurcation."""
- failures = [(18, '-2', 1, 19, '7.0;1.0', '1.0;0.25'),
- (19, '-2', 1, 18, '7.0;1.0', '1.0;0.25')]
+ failures = [(18, '-2', 1, 19, '7.0;1.0', '1.0;0.25','0'),
+ (19, '-2', 1, 18, '7.0;1.0', '1.0;0.25','0')]
for s in failures:
record = {
@@ -111,6 +111,8 @@
'q_dist': '2',
'v_val': s[5],
'v_dist': '0',
+ 'vol_val': s[6],
+ 'vol_dist': '0',
'l': '1000.0',
'd_val': '0.75',
'd_dist': '0'
@@ -140,10 +142,10 @@
def test_graphintegritycheck_doubleroot(self):
"""Test graph integrity check: Two root stretches."""
- failures = [(18, '-2', 1, 19, '7.0;1.0', '1.0;0.25'),
- (19, '-2', 1, 18, '7.0;1.0', '1.0;0.25'),
- (20, '0', 18, 0, '7.0;1.0', '1.0;0.25'),
- (21, '0', 19, 0, '7.0;1.0', '1.0;0.25')]
+ failures = [(18, '-2', 1, 19, '7.0;1.0', '1.0;0.25','0'),
+ (19, '-2', 1, 18, '7.0;1.0', '1.0;0.25','0'),
+ (20, '0', 18, 0, '7.0;1.0', '1.0;0.25','0'),
+ (21, '0', 19, 0, '7.0;1.0', '1.0;0.25','0')]
for s in failures:
record = {
@@ -160,6 +162,8 @@
'q_dist': '2',
'v_val': s[5],
'v_dist': '0',
+ 'vol_val': s[6],
+ 'vol_dist': '0',
'l': '1000.0',
'd_val': '0.75',
'd_dist': '0'
Modified: trunk/GREAT-ERModel/test/test_pb_worker.py
===================================================================
--- trunk/GREAT-ERModel/test/test_pb_worker.py 2011-12-02 14:13:55 UTC (rev 3855)
+++ trunk/GREAT-ERModel/test/test_pb_worker.py 2011-12-02 16:00:36 UTC (rev 3856)
@@ -115,7 +115,10 @@
self.assertEquals(self.results,
[[('DISCH', 'FLOW_DOM'), ('DISCH', 'POP'),
('STRETCH', 'L'), ('STRETCH', 'Q_DIST'),
- ('STRETCH', 'Q_VAL'), ('STRETCH', 'V_DIST'),
+ ('STRETCH', 'Q_VAL'),
+ ('STRETCH', 'VOL_DIST'),
+ ('STRETCH', 'VOL_VAL'),
+ ('STRETCH', 'V_DIST'),
('STRETCH', 'V_VAL'),
('SUBST', 'DEFAULT_CONSUMPTION'),
('SUBST', 'K_INSTREAM'),
Modified: trunk/GREAT-ERModel/test/test_sessionmethods.py
===================================================================
--- trunk/GREAT-ERModel/test/test_sessionmethods.py 2011-12-02 14:13:55 UTC (rev 3855)
+++ trunk/GREAT-ERModel/test/test_sessionmethods.py 2011-12-02 16:00:36 UTC (rev 3856)
@@ -111,7 +111,8 @@
session_required_parameters('A','B','C',self.sess_id),
[('DISCH', 'FLOW_DOM'), ('DISCH', 'POP'),
('STRETCH', 'L'), ('STRETCH', 'Q_DIST'), ('STRETCH', 'Q_VAL'),
- ('STRETCH', 'V_DIST'), ('STRETCH', 'V_VAL'),
+ ('STRETCH', 'VOL_DIST'), ('STRETCH', 'VOL_VAL'),
+ ('STRETCH', 'V_DIST'), ('STRETCH', 'V_VAL'),
('SUBST', 'DEFAULT_CONSUMPTION'),
('SUBST', 'K_INSTREAM'), ('SUBST', 'R_ACTIVATED_SLUDGE'),
('SUBST', 'R_PRIMARY'), ('SUBST', 'R_TRICKLING_FILTER')]
Modified: trunk/GREAT-ERModel/test/test_xmlrpc_session.py
===================================================================
--- trunk/GREAT-ERModel/test/test_xmlrpc_session.py 2011-12-02 14:13:55 UTC (rev 3855)
+++ trunk/GREAT-ERModel/test/test_xmlrpc_session.py 2011-12-02 16:00:36 UTC (rev 3856)
@@ -54,7 +54,10 @@
self.assertEquals(parameters,
[['DISCH', 'FLOW_DOM'], ['DISCH', 'POP'],
['STRETCH', 'L'], ['STRETCH', 'Q_DIST'],
- ['STRETCH', 'Q_VAL'], ['STRETCH', 'V_DIST'],
+ ['STRETCH', 'Q_VAL'],
+ ['STRETCH', 'VOL_DIST'],
+ ['STRETCH', 'VOL_VAL'],
+ ['STRETCH', 'V_DIST'],
['STRETCH', 'V_VAL'],
['SUBST', 'DEFAULT_CONSUMPTION'],
['SUBST', 'K_INSTREAM'],
More information about the Greater-commits
mailing list