update tests for coverage-dependence data as_dict

The on-disk/YAML format for enthalpy-coefficients/entropy-coefficients changed:

Old: {'class': 'np_array', 'object': [<Enthalpy>, ...]}
New: [{'class': 'ScalarQuantity', 'value': ..., 'units': '...'}, ...]

Author: rwest

test/rmgpy/thermo/nasaTest.py

@@ -378,10 +378,10 @@ def test_nasa_as_dict_full(self):
         assert nasa_dict["thermo_coverage_dependence"].keys() == self.thermo_coverage_dependence.keys()
         sp_name = list(self.thermo_coverage_dependence.keys())[0]
         assert nasa_dict['thermo_coverage_dependence'][sp_name]['model'] == self.thermo_coverage_dependence[sp_name]['model']
-        enthalpy_list = nasa_dict['thermo_coverage_dependence'][sp_name]['enthalpy-coefficients']['object']
-        assert [(int(coeff.value), str(coeff.units)) for coeff in enthalpy_list] == self.thermo_coverage_dependence[sp_name]['enthalpy-coefficients']
-        entropy_list = nasa_dict['thermo_coverage_dependence'][sp_name]['entropy-coefficients']['object']
-        assert [(int(coeff.value), str(coeff.units)) for coeff in entropy_list] == self.thermo_coverage_dependence[sp_name]['entropy-coefficients']
+        enthalpy_list = nasa_dict['thermo_coverage_dependence'][sp_name]['enthalpy-coefficients']
+        assert [(int(coeff['value']), str(coeff['units'])) for coeff in enthalpy_list] == self.thermo_coverage_dependence[sp_name]['enthalpy-coefficients']
+        entropy_list = nasa_dict['thermo_coverage_dependence'][sp_name]['entropy-coefficients']
+        assert [(int(coeff['value']), str(coeff['units'])) for coeff in entropy_list] == self.thermo_coverage_dependence[sp_name]['entropy-coefficients']
         assert nasa_dict["comment"] == self.comment
         assert tuple(nasa_dict["polynomials"]["polynomial1"]["coeffs"]["object"]) == tuple(self.coeffs_low)
         assert tuple(nasa_dict["polynomials"]["polynomial2"]["coeffs"]["object"]) == tuple(self.coeffs_high)
@@ -403,6 +403,7 @@ def test_nasa_as_dict_minimal(self):
         assert "CpInf" not in keys
         assert "label" not in keys
         assert "comment" not in keys
+        assert "thermo_coverage_dependence" not in keys
 
     def test_nasa_polynomial_as_dict(self):
         """

test/rmgpy/thermo/wilhoitTest.py

@@ -432,10 +432,10 @@ def test_wilhoit_as_dict(self):
         assert wilhoit_dict["thermo_coverage_dependence"].keys() == self.thermo_coverage_dependence.keys()
         sp_name = list(self.thermo_coverage_dependence.keys())[0]
         assert wilhoit_dict['thermo_coverage_dependence'][sp_name]['model'] == self.thermo_coverage_dependence[sp_name]['model']
-        enthalpy_list = wilhoit_dict['thermo_coverage_dependence'][sp_name]['enthalpy-coefficients']['object']
-        assert [(int(coeff.value), str(coeff.units)) for coeff in enthalpy_list] == self.thermo_coverage_dependence[sp_name]['enthalpy-coefficients']
-        entropy_list = wilhoit_dict['thermo_coverage_dependence'][sp_name]['entropy-coefficients']['object']
-        assert [(int(coeff.value), str(coeff.units)) for coeff in entropy_list] == self.thermo_coverage_dependence[sp_name]['entropy-coefficients']
+        enthalpy_list = wilhoit_dict['thermo_coverage_dependence'][sp_name]['enthalpy-coefficients']
+        assert [(int(coeff['value']), str(coeff['units'])) for coeff in enthalpy_list] == self.thermo_coverage_dependence[sp_name]['enthalpy-coefficients']
+        entropy_list = wilhoit_dict['thermo_coverage_dependence'][sp_name]['entropy-coefficients']
+        assert [(int(coeff['value']), str(coeff['units'])) for coeff in entropy_list] == self.thermo_coverage_dependence[sp_name]['entropy-coefficients']
 
         wilhoit_dict = {k: wilhoit_dict[k] for k in wilhoit_dict.keys() - {'thermo_coverage_dependence'}}
         assert wilhoit_dict == {