Skip to content

Commit 290c0bf

Browse files
committed
pass parameters correctly in unit tests
1 parent a3e99d5 commit 290c0bf

16 files changed

+59
-22
lines changed

tests/EN_background_available_check_validation.py

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
class TestClass:
1010

1111
parameters = {
12+
'db': 'iquod.db',
1213
"table": 'unit'
1314
}
1415
qctests.EN_background_check.loadParameters(parameters)

tests/EN_background_check_validation.py

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
class TestClass:
1010

1111
parameters = {
12+
'db': 'iquod.db',
1213
"table": 'unit'
1314
}
1415
qctests.EN_background_check.loadParameters(parameters)

tests/EN_constant_value_check_validation.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
class TestClass:
1010

1111
parameters = {
12+
'db': 'iquod.db',
1213
"table": 'unit'
1314
}
1415

@@ -53,4 +54,4 @@ def test_EN_constant_value_missing_depth(self):
5354
p = util.testingProfile.fakeProfile([0,0,0,0,0,0,0,0,0,0], [100,200,300,400,500,600,700,800,900,None], uid=8888)
5455
qc = qctests.EN_constant_value_check.test(p, self.parameters)
5556
truth = numpy.ones(10, dtype=bool)
56-
assert numpy.array_equal(qc, truth), 'failing to flag when the deepest depth in a run of constant temperature is missing.'
57+
assert numpy.array_equal(qc, truth), 'failing to flag when the deepest depth in a run of constant temperature is missing.'

tests/EN_increasing_depth_check_validation.py

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
class TestClass:
99

1010
parameters = {
11+
'db': 'iquod.db',
1112
"table": 'unit'
1213
}
1314

tests/EN_spike_and_step_check_validation.py

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
class TestClass:
99

1010
parameters = {
11+
'db': 'iquod.db',
1112
"table": 'unit'
1213
}
1314

tests/EN_stability_check_validation.py

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
class TestClass:
1010

1111
parameters = {
12+
'db': 'iquod.db',
1213
"table": 'unit'
1314
}
1415

tests/ICDC_aqc_01_level_order_validation.py

+11-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99

1010
class TestClass:
1111

12-
parameters = {}
12+
parameters = {
13+
'db': 'iquod.db',
14+
'table': 'unit'
15+
}
1316

1417
def setUp(self):
1518
# refresh this table every test
@@ -25,18 +28,18 @@ def test_ICDC_level_order_simple(self):
2528
[2.0, -1.0, 1.0],
2629
uid=8888)
2730
qc = ICDC.test(p, self.parameters)
28-
nlevels, zr, tr = ICDC.reordered_data(p)
29-
zreverted = ICDC.revert_order(p, zr)
30-
zreverted_truth = np.ma.array([2.0, -1.0, 1.0],
31+
nlevels, zr, tr = ICDC.reordered_data(p, self.parameters)
32+
zreverted = ICDC.revert_order(p, zr, self.parameters)
33+
zreverted_truth = np.ma.array([2.0, -1.0, 1.0],
3134
mask = [False, True, False])
32-
35+
3336
assert np.array_equal(qc, [False, True, False]), 'QC error'
3437
assert nlevels == 2, 'Subsetting of levels incorrect'
3538
assert np.array_equal(zr, [1.0, 2.0]), 'Depth reorder failed'
3639
assert np.array_equal(tr, [3.0, 1.0]), 'Temperature reorder failed'
37-
assert np.array_equal(zreverted.data[zreverted.mask == False],
40+
assert np.array_equal(zreverted.data[zreverted.mask == False],
3841
zreverted_truth.data[zreverted_truth.mask == False]), 'Revert data failed'
39-
assert np.array_equal(zreverted.mask,
42+
assert np.array_equal(zreverted.mask,
4043
zreverted_truth.mask), 'Revert data failed'
4144

4245
def test_ICDC_level_order(self):
@@ -64,7 +67,7 @@ def test_ICDC_level_order(self):
6467
assert np.array_equal(qc, qctruth), 'Example {} QC wrong'.format(i + 1)
6568

6669
# Check that the reordering is correct.
67-
nlevels, zr, tr = ICDC.reordered_data(p)
70+
nlevels, zr, tr = ICDC.reordered_data(p, self.parameters)
6871
assert np.array_equal(zr, ztruth), 'Example {} zr wrong'.format(i + 1)
6972
assert np.array_equal(tr, ttruth), 'Example {} tr wrong'.format(i + 1)
7073

tests/ICDC_aqc_02_crude_range_validation.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010

1111
class TestClass:
1212

13-
parameters = {}
13+
parameters = {
14+
'db': 'iquod.db',
15+
'table': 'unit'
16+
}
1417

1518
def setUp(self):
1619
# refresh this table every test

tests/ICDC_aqc_04_max_obs_depth_validation.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010

1111
class TestClass:
1212

13-
parameters = {}
13+
parameters = {
14+
'db': 'iquod.db',
15+
'table': 'unit'
16+
}
1417

1518
def setUp(self):
1619
# refresh this table every test

tests/ICDC_aqc_05_stuck_value_validation.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010

1111
class TestClass:
1212

13-
parameters = {}
13+
parameters = {
14+
'db': 'iquod.db',
15+
'table': 'unit'
16+
}
1417

1518
def setUp(self):
1619
# refresh this table every test

tests/ICDC_aqc_06_n_temperature_extrema_validation.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
##### --------------------------------------------------
1010
class TestClass:
1111

12-
parameters = {}
12+
parameters = {
13+
'db': 'iquod.db',
14+
'table': 'unit'
15+
}
1316

1417
def setUp(self):
1518
# refresh this table every test

tests/ICDC_aqc_07_spike_check_validation.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
##### --------------------------------------------------
1010
class TestClass:
1111

12-
parameters = {}
12+
parameters = {
13+
'db': 'iquod.db',
14+
'table': 'unit'
15+
}
1316

1417
def setUp(self):
1518
# refresh this table every test

tests/ICDC_aqc_08_gradient_check_validation.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
##### --------------------------------------------------
1010
class TestClass:
1111

12-
parameters = {}
12+
parameters = {
13+
'db': 'iquod.db',
14+
'table': 'unit'
15+
}
1316

1417
def setUp(self):
1518
# refresh this table every test

tests/ICDC_aqc_09_local_climatology_check_validation.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
##### --------------------------------------------------
1010
class TestClass:
1111

12-
parameters = {}
13-
12+
parameters = {
13+
'db': 'iquod.db',
14+
'table': 'unit'
15+
}
16+
1417
def setUp(self):
1518
# refresh this table every test
1619
ICDC.loadParameters(self.parameters)
@@ -55,7 +58,7 @@ def test_ICDC_local_climatology_check(self):
5558
date=[year,month,day,0],
5659
uid=i)
5760

58-
nlevels, z, t = ICDC.reordered_data(p)
61+
nlevels, z, t = ICDC.reordered_data(p, self.parameters)
5962
lat = p.latitude()
6063
lon = p.longitude()
6164
tmin, tmax = ICDC_lc.get_climatology_range(nlevels,

tests/ICDC_aqc_10_local_climatology_check_validation.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
##### --------------------------------------------------
88
class TestClass():
99

10-
parameters = {}
11-
10+
parameters = {
11+
'db': 'iquod.db',
12+
'table': 'unit'
13+
}
14+
1215
def setUp(self):
1316
# refresh this table every test
1417
ICDC.loadParameters(self.parameters)

tests/WOD_range_check_validation.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ def test_WOD_range_check_spotcheck():
1010
spot check the WOD_range_test
1111
'''
1212

13-
parameters = {}
13+
parameters = {
14+
'db': 'iquod.db',
15+
'table': 'unit'
16+
}
17+
1418
qctests.WOD_range_check.loadParameters(parameters)
1519

1620
# should just barely pass; temperatures at threshold for these depths
@@ -24,4 +28,4 @@ def test_WOD_range_check_spotcheck():
2428
qc = qctests.WOD_range_check.test(p, parameters)
2529
truth = numpy.zeros(2, dtype=bool)
2630
truth[1] = True
27-
assert numpy.array_equal(qc, truth), 'failed to flag deep warm temperatures in antarctic'
31+
assert numpy.array_equal(qc, truth), 'failed to flag deep warm temperatures in antarctic'

0 commit comments

Comments
 (0)