diff options
Diffstat (limited to 'networkx/classes/tests/historical_tests.py')
-rw-r--r-- | networkx/classes/tests/historical_tests.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/networkx/classes/tests/historical_tests.py b/networkx/classes/tests/historical_tests.py index f41f94da..daa5dbaf 100644 --- a/networkx/classes/tests/historical_tests.py +++ b/networkx/classes/tests/historical_tests.py @@ -2,7 +2,7 @@ import pytest import networkx as nx from networkx import convert_node_labels_to_integers as cnlti -from networkx.testing import assert_edges_equal, assert_nodes_equal +from networkx.utils import nodes_equal, edges_equal class HistoricalTests: @@ -258,22 +258,22 @@ class HistoricalTests: else: elist = [("A", "B"), ("A", "C"), ("B", "C"), ("B", "D")] # nbunch can be a list - assert_edges_equal(list(G.edges(["A", "B"])), elist) + assert edges_equal(list(G.edges(["A", "B"])), elist) # nbunch can be a set - assert_edges_equal(G.edges({"A", "B"}), elist) + assert edges_equal(G.edges({"A", "B"}), elist) # nbunch can be a graph G1 = self.G() G1.add_nodes_from("AB") - assert_edges_equal(G.edges(G1), elist) + assert edges_equal(G.edges(G1), elist) # nbunch can be a dict with nodes as keys ndict = {"A": "thing1", "B": "thing2"} - assert_edges_equal(G.edges(ndict), elist) + assert edges_equal(G.edges(ndict), elist) # nbunch can be a single node - assert_edges_equal(list(G.edges("A")), [("A", "B"), ("A", "C")]) - assert_nodes_equal(sorted(G), ["A", "B", "C", "D"]) + assert edges_equal(list(G.edges("A")), [("A", "B"), ("A", "C")]) + assert nodes_equal(sorted(G), ["A", "B", "C", "D"]) # nbunch can be nothing (whole graph) - assert_edges_equal( + assert edges_equal( list(G.edges()), [("A", "B"), ("A", "C"), ("B", "D"), ("C", "B"), ("C", "D")], ) @@ -330,8 +330,8 @@ class HistoricalTests: G = self.G() G.add_edges_from([("A", "B"), ("A", "C"), ("B", "D"), ("C", "B"), ("C", "D")]) SG = G.subgraph(["A", "B", "D"]) - assert_nodes_equal(list(SG), ["A", "B", "D"]) - assert_edges_equal(list(SG.edges()), [("A", "B"), ("B", "D")]) + assert nodes_equal(list(SG), ["A", "B", "D"]) + assert edges_equal(list(SG.edges()), [("A", "B"), ("B", "D")]) def test_to_directed(self): G = self.G() @@ -400,7 +400,7 @@ class HistoricalTests: G.add_edges_from([("A", "B"), ("A", "C"), ("B", "D"), ("C", "B"), ("C", "D")]) G.add_nodes_from("GJK") assert sorted(G.nodes()) == ["A", "B", "C", "D", "G", "J", "K"] - assert_edges_equal( + assert edges_equal( G.edges(), [("A", "B"), ("A", "C"), ("B", "D"), ("C", "B"), ("C", "D")] ) |