From 0d94ea70bff6023a5fd4e7a64c7e544bc9b54a24 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 24 Apr 2017 20:12:20 -0600 Subject: [PATCH] don't separately test initialize(); allow testing even if initial value of array is NaN --- bmi_tester/bmitester.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/bmi_tester/bmitester.py b/bmi_tester/bmitester.py index 694fc8c..88552df 100644 --- a/bmi_tester/bmitester.py +++ b/bmi_tester/bmitester.py @@ -11,6 +11,7 @@ assert_greater, assert_in) from .termcolors import red, green, yellow, blink +import math # from components import InfilGreenAmpt as Component @@ -383,9 +384,9 @@ def test_get_time_units(self): assert_in(units, ('s', 'seconds', 'd', 'days', 'y', 'years')) return units - #def test_get_value(self): - # get_value() is tested via test_get_input_values() and - # test_get_output_values() + # get_value() is tested via test_get_input_values() and + # test_get_output_values() and is not tested separately + # def test_get_value(self): def test_get_input_values(self): """Input values are numpy arrays.""" @@ -515,9 +516,11 @@ def test_get_var_units(self): names = set(self.bmi.get_input_var_names()) | set(self.bmi.get_output_var_names()) self.foreach(names, self._test_var_units) - def test_initialize(self): - """Test initialization from a file.""" - self.bmi.initialize(self._file) + # initialize is called by __init__() and therefore + # does not need a separate test + # def test_initialize(self): + # """Test initialization from a file.""" + # self.bmi.initialize(self._file) def test_get_value_and_set_value(self): """Test if we can get and set the value of (input) variables""" @@ -569,7 +572,10 @@ def _test(): val_first_value = val[0, 0, 0] # Replace the first value of the array with a new value - val_test_value += val_first_value + 1 + if math.isnan(val_first_value): + val_test_value = 1 + else: + val_test_value += val_first_value + 1 if valrank == 1: self.bmi.set_value_at_indices(name, [0], val_test_value)