code quality

Author: Yingli

tests/ecm_prep_test/add_key_vals_test.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-""" Tests for AddKeyValsTest """
+"""Tests for AddKeyValsTest"""
 
 from scout.ecm_prep import Measure
 from scout.ecm_prep_vars import UsefulVars, UsefulInputFiles
@@ -29,61 +29,45 @@ def test_data():
         "structure_type": ["new", "existing"],
         "climate_zone": ["AIA_CZ1", "AIA_CZ2"],
         "bldg_type": ["single family home"],
-        "fuel_type": {
-            "primary": ["electricity"],
-            "secondary": None},
+        "fuel_type": {"primary": ["electricity"], "secondary": None},
         "fuel_switch_to": None,
-        "end_use": {
-            "primary": ["heating", "cooling"],
-            "secondary": None},
+        "end_use": {"primary": ["heating", "cooling"], "secondary": None},
         "technology": {
             "primary": ["resistance heat", "ASHP", "GSHP", "room AC"],
-            "secondary": None}}
-    sample_measure_in = Measure(
-        base_dir, handyvars, handyfiles, opts_dict,
-        **sample_measure_in)
-    ok_dict1_in, ok_dict2_in = ({
-        "level 1a": {
-            "level 2aa": {"2009": 2, "2010": 3},
-            "level 2ab": {"2009": 4, "2010": 5}},
-        "level 1b": {
-            "level 2ba": {"2009": 6, "2010": 7},
-            "level 2bb": {"2009": 8, "2010": 9}}} for n in range(2))
-    ok_dict3_in, ok_dict4_in = ({
-        "level 1a": {
-            "level 2aa": {"2009": 2, "2010": 3},
-            "level 2ab": {"2009": 4, "2010": 5}},
-        "lifetime": {
-            "level 2ba": {"2009": 6, "2010": 7},
-            "level 2bb": {"2009": 8, "2010": 9}}} for n in range(2))
+            "secondary": None,
+        },
+    }
+    sample_measure_in = Measure(base_dir, handyvars, handyfiles, opts_dict, **sample_measure_in)
+    ok_dict1_in, ok_dict2_in = (
+        {
+            "level 1a": {"level 2aa": {"2009": 2, "2010": 3}, "level 2ab": {"2009": 4, "2010": 5}},
+            "level 1b": {"level 2ba": {"2009": 6, "2010": 7}, "level 2bb": {"2009": 8, "2010": 9}},
+        }
+        for n in range(2)
+    )
+    ok_dict3_in, ok_dict4_in = (
+        {
+            "level 1a": {"level 2aa": {"2009": 2, "2010": 3}, "level 2ab": {"2009": 4, "2010": 5}},
+            "lifetime": {"level 2ba": {"2009": 6, "2010": 7}, "level 2bb": {"2009": 8, "2010": 9}},
+        }
+        for n in range(2)
+    )
     fail_dict1_in = {
-        "level 1a": {
-            "level 2aa": {"2009": 2, "2010": 3},
-            "level 2ab": {"2009": 4, "2010": 5}},
-        "level 1b": {
-            "level 2ba": {"2009": 6, "2010": 7},
-            "level 2bb": {"2009": 8, "2010": 9}}}
+        "level 1a": {"level 2aa": {"2009": 2, "2010": 3}, "level 2ab": {"2009": 4, "2010": 5}},
+        "level 1b": {"level 2ba": {"2009": 6, "2010": 7}, "level 2bb": {"2009": 8, "2010": 9}},
+    }
     fail_dict2_in = {
-        "level 1a": {
-            "level 2aa": {"2009": 2, "2010": 3},
-            "level 2ab": {"2009": 4, "2010": 5}},
-        "level 1b": {
-            "level 2ba": {"2009": 6, "2010": 7},
-            "level 2bb": {"2009": 8, "2011": 9}}}
+        "level 1a": {"level 2aa": {"2009": 2, "2010": 3}, "level 2ab": {"2009": 4, "2010": 5}},
+        "level 1b": {"level 2ba": {"2009": 6, "2010": 7}, "level 2bb": {"2009": 8, "2011": 9}},
+    }
     ok_out = {
-        "level 1a": {
-            "level 2aa": {"2009": 4, "2010": 6},
-            "level 2ab": {"2009": 8, "2010": 10}},
-        "level 1b": {
-            "level 2ba": {"2009": 12, "2010": 14},
-            "level 2bb": {"2009": 16, "2010": 18}}}
+        "level 1a": {"level 2aa": {"2009": 4, "2010": 6}, "level 2ab": {"2009": 8, "2010": 10}},
+        "level 1b": {"level 2ba": {"2009": 12, "2010": 14}, "level 2bb": {"2009": 16, "2010": 18}},
+    }
     ok_out_restrict = {
-        "level 1a": {
-            "level 2aa": {"2009": 4, "2010": 6},
-            "level 2ab": {"2009": 8, "2010": 10}},
-        "lifetime": {
-            "level 2ba": {"2009": 6, "2010": 7},
-            "level 2bb": {"2009": 8, "2010": 9}}}
+        "level 1a": {"level 2aa": {"2009": 4, "2010": 6}, "level 2ab": {"2009": 8, "2010": 10}},
+        "lifetime": {"level 2ba": {"2009": 6, "2010": 7}, "level 2bb": {"2009": 8, "2010": 9}},
+    }
 
     return {
         "sample_measure_in": sample_measure_in,
@@ -106,7 +90,10 @@ def test_ok_add_keyvals(test_data):
     """
     dict_check(
         test_data["sample_measure_in"].add_keyvals(
-            test_data["ok_dict1_in"], test_data["ok_dict2_in"]), test_data["ok_out"])
+            test_data["ok_dict1_in"], test_data["ok_dict2_in"]
+        ),
+        test_data["ok_out"],
+    )
 
 
 def test_fail_add_keyvals(test_data):
@@ -117,11 +104,15 @@ def test_fail_add_keyvals(test_data):
     """
     with pytest.raises(KeyError):
         test_data["sample_measure_in"].add_keyvals(
-            test_data["fail_dict1_in"], test_data["fail_dict2_in"])
+            test_data["fail_dict1_in"], test_data["fail_dict2_in"]
+        )
 
 
 def test_ok_add_keyvals_restrict(test_data):
     """Test 'add_keyvals_restrict' function given valid inputs."""
     dict_check(
         test_data["sample_measure_in"].add_keyvals_restrict(
-            test_data["ok_dict3_in"], test_data["ok_dict4_in"]), test_data["ok_out_restrict"])
+            test_data["ok_dict3_in"], test_data["ok_dict4_in"]
+        ),
+        test_data["ok_out_restrict"],
+    )