diff --git a/tests/test_umi.py b/tests/test_umi.py index 1305c920..3403d949 100644 --- a/tests/test_umi.py +++ b/tests/test_umi.py @@ -33,7 +33,7 @@ class TestUmiTemplate: """Test suite for the UmiTemplateLibrary class""" @pytest.fixture(scope="function") - def two_identical_libraries(self): + def two_identical_libraries(self, config): """Yield two identical libraries. Scope of this fixture is `function`.""" file = data_dir / "umi_samples/BostonTemplateLibrary_nodup.json" yield UmiTemplateLibrary.open(file), UmiTemplateLibrary.open(file) @@ -74,7 +74,7 @@ def test_unique_components(self, two_identical_libraries): # missing S. c.unique_components("OpaqueMaterial") - def test_graph(self): + def test_graph(self, config): """Test initialization of networkx DiGraph""" file = data_dir / "umi_samples/BostonTemplateLibrary_2.json" @@ -86,7 +86,7 @@ def test_graph(self): G = a.to_graph(include_orphans=True) assert len(G) > n_nodes - def test_template_to_template(self): + def test_template_to_template(self, config): """load the json into UmiTemplateLibrary object, then convert back to json and compare""" @@ -160,7 +160,7 @@ def read_json(file): return data_dict @pytest.fixture() - def idf(self): + def idf(self, config): yield IDF(prep_outputs=False) @pytest.fixture() diff --git a/tests/test_zonegraph.py b/tests/test_zonegraph.py index 407e8ffa..59fcaad0 100644 --- a/tests/test_zonegraph.py +++ b/tests/test_zonegraph.py @@ -29,7 +29,7 @@ def test_traverse_graph(self, small_office): assert G @pytest.fixture(scope="class") - def G(self, config, small_office): + def G(self, small_office): """ Args: config: @@ -40,7 +40,7 @@ def G(self, config, small_office): yield ZoneGraph.from_idf(idf) @pytest.mark.parametrize("adj_report", [True, False]) - def test_graph(self, config, small_office, adj_report): + def test_graph(self, small_office, adj_report): """Test the creation of a BuildingTemplate zone graph. Parametrize the creation of the adjacency report @@ -61,7 +61,7 @@ def test_graph(self, config, small_office, adj_report): EpBunch, ) - def test_graph_info(self, config, G): + def test_graph_info(self, G): """test the info method on a ZoneGraph Args: @@ -69,7 +69,7 @@ def test_graph_info(self, config, G): """ G.info() - def test_viewgraph2d(self, config, G): + def test_viewgraph2d(self, G): """test the visualization of the zonegraph in 2d Args: @@ -92,7 +92,7 @@ def test_viewgraph2d(self, config, G): ) @pytest.mark.parametrize("annotate", [True, "Name", ("core", None)]) - def test_viewgraph3d(self, config, G, annotate): + def test_viewgraph3d(self, G, annotate): """test the visualization of the zonegraph in 3d Args: @@ -106,7 +106,7 @@ def test_viewgraph3d(self, config, G, annotate): show=False, ) - def test_core_graph(self, config, G): + def test_core_graph(self, G): """ Args: G: @@ -116,7 +116,7 @@ def test_core_graph(self, config, G): assert len(H) == 1 # assert G has no nodes since Warehouse does not have a # core zone - def test_perim_graph(self, config, G): + def test_perim_graph(self, G): """ Args: G: