diff options
Diffstat (limited to 'networkx/classes')
| -rw-r--r-- | networkx/classes/tests/historical_tests.py | 22 | ||||
| -rw-r--r-- | networkx/classes/tests/test_digraph.py | 4 | ||||
| -rw-r--r-- | networkx/classes/tests/test_function.py | 76 | ||||
| -rw-r--r-- | networkx/classes/tests/test_graph.py | 87 | ||||
| -rw-r--r-- | networkx/classes/tests/test_graphviews.py | 22 | ||||
| -rw-r--r-- | networkx/classes/tests/test_multidigraph.py | 6 | ||||
| -rw-r--r-- | networkx/classes/tests/test_multigraph.py | 16 |
7 files changed, 114 insertions, 119 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")] ) diff --git a/networkx/classes/tests/test_digraph.py b/networkx/classes/tests/test_digraph.py index 76702827..0eb12079 100644 --- a/networkx/classes/tests/test_digraph.py +++ b/networkx/classes/tests/test_digraph.py @@ -1,7 +1,7 @@ import pytest import networkx as nx -from networkx.testing import assert_nodes_equal +from networkx.utils import nodes_equal from .test_graph import BaseGraphTester, BaseAttrGraphTester from .test_graph import TestGraph as _TestGraph from .test_graph import TestEdgeSubgraph as _TestGraphEdgeSubgraph @@ -128,7 +128,7 @@ class BaseDiGraphTester(BaseGraphTester): y = Foo() G = nx.DiGraph() G.add_edge(x, y) - assert_nodes_equal(G.nodes(), G.reverse().nodes()) + assert nodes_equal(G.nodes(), G.reverse().nodes()) assert [(y, x)] == list(G.reverse().edges()) diff --git a/networkx/classes/tests/test_function.py b/networkx/classes/tests/test_function.py index 9723f434..5c3fbe95 100644 --- a/networkx/classes/tests/test_function.py +++ b/networkx/classes/tests/test_function.py @@ -1,7 +1,7 @@ import random import pytest import networkx as nx -from networkx.testing.utils import assert_edges_equal, assert_nodes_equal +from networkx.utils import nodes_equal, edges_equal class TestFunction: @@ -17,13 +17,13 @@ class TestFunction: self.DGedges = [(0, 1), (0, 2), (0, 3), (1, 0), (1, 1), (1, 2)] def test_nodes(self): - assert_nodes_equal(self.G.nodes(), list(nx.nodes(self.G))) - assert_nodes_equal(self.DG.nodes(), list(nx.nodes(self.DG))) + assert nodes_equal(self.G.nodes(), list(nx.nodes(self.G))) + assert nodes_equal(self.DG.nodes(), list(nx.nodes(self.DG))) def test_edges(self): - assert_edges_equal(self.G.edges(), list(nx.edges(self.G))) + assert edges_equal(self.G.edges(), list(nx.edges(self.G))) assert sorted(self.DG.edges()) == sorted(nx.edges(self.DG)) - assert_edges_equal( + assert edges_equal( self.G.edges(nbunch=[0, 1, 3]), list(nx.edges(self.G, nbunch=[0, 1, 3])) ) assert sorted(self.DG.edges(nbunch=[0, 1, 3])) == sorted( @@ -31,15 +31,15 @@ class TestFunction: ) def test_degree(self): - assert_edges_equal(self.G.degree(), list(nx.degree(self.G))) + assert edges_equal(self.G.degree(), list(nx.degree(self.G))) assert sorted(self.DG.degree()) == sorted(nx.degree(self.DG)) - assert_edges_equal( + assert edges_equal( self.G.degree(nbunch=[0, 1]), list(nx.degree(self.G, nbunch=[0, 1])) ) assert sorted(self.DG.degree(nbunch=[0, 1])) == sorted( nx.degree(self.DG, nbunch=[0, 1]) ) - assert_edges_equal( + assert edges_equal( self.G.degree(weight="weight"), list(nx.degree(self.G, weight="weight")) ) assert sorted(self.DG.degree(weight="weight")) == sorted( @@ -66,11 +66,11 @@ class TestFunction: G = self.G.copy() nlist = [12, 13, 14, 15] nx.add_star(G, nlist) - assert_edges_equal(G.edges(nlist), [(12, 13), (12, 14), (12, 15)]) + assert edges_equal(G.edges(nlist), [(12, 13), (12, 14), (12, 15)]) G = self.G.copy() nx.add_star(G, nlist, weight=2.0) - assert_edges_equal( + assert edges_equal( G.edges(nlist, data=True), [ (12, 13, {"weight": 2.0}), @@ -82,22 +82,22 @@ class TestFunction: G = self.G.copy() nlist = [12] nx.add_star(G, nlist) - assert_nodes_equal(G, list(self.G) + nlist) + assert nodes_equal(G, list(self.G) + nlist) G = self.G.copy() nlist = [] nx.add_star(G, nlist) - assert_nodes_equal(G.nodes, self.Gnodes) - assert_edges_equal(G.edges, self.G.edges) + assert nodes_equal(G.nodes, self.Gnodes) + assert edges_equal(G.edges, self.G.edges) def test_add_path(self): G = self.G.copy() nlist = [12, 13, 14, 15] nx.add_path(G, nlist) - assert_edges_equal(G.edges(nlist), [(12, 13), (13, 14), (14, 15)]) + assert edges_equal(G.edges(nlist), [(12, 13), (13, 14), (14, 15)]) G = self.G.copy() nx.add_path(G, nlist, weight=2.0) - assert_edges_equal( + assert edges_equal( G.edges(nlist, data=True), [ (12, 13, {"weight": 2.0}), @@ -109,38 +109,38 @@ class TestFunction: G = self.G.copy() nlist = [None] nx.add_path(G, nlist) - assert_edges_equal(G.edges(nlist), []) - assert_nodes_equal(G, list(self.G) + [None]) + assert edges_equal(G.edges(nlist), []) + assert nodes_equal(G, list(self.G) + [None]) G = self.G.copy() nlist = iter([None]) nx.add_path(G, nlist) - assert_edges_equal(G.edges([None]), []) - assert_nodes_equal(G, list(self.G) + [None]) + assert edges_equal(G.edges([None]), []) + assert nodes_equal(G, list(self.G) + [None]) G = self.G.copy() nlist = [12] nx.add_path(G, nlist) - assert_edges_equal(G.edges(nlist), []) - assert_nodes_equal(G, list(self.G) + [12]) + assert edges_equal(G.edges(nlist), []) + assert nodes_equal(G, list(self.G) + [12]) G = self.G.copy() nlist = iter([12]) nx.add_path(G, nlist) - assert_edges_equal(G.edges([12]), []) - assert_nodes_equal(G, list(self.G) + [12]) + assert edges_equal(G.edges([12]), []) + assert nodes_equal(G, list(self.G) + [12]) G = self.G.copy() nlist = [] nx.add_path(G, nlist) - assert_edges_equal(G.edges, self.G.edges) - assert_nodes_equal(G, list(self.G)) + assert edges_equal(G.edges, self.G.edges) + assert nodes_equal(G, list(self.G)) G = self.G.copy() nlist = iter([]) nx.add_path(G, nlist) - assert_edges_equal(G.edges, self.G.edges) - assert_nodes_equal(G, list(self.G)) + assert edges_equal(G.edges, self.G.edges) + assert nodes_equal(G, list(self.G)) def test_add_cycle(self): G = self.G.copy() @@ -172,13 +172,13 @@ class TestFunction: G = self.G.copy() nlist = [12] nx.add_cycle(G, nlist) - assert_nodes_equal(G, list(self.G) + nlist) + assert nodes_equal(G, list(self.G) + nlist) G = self.G.copy() nlist = [] nx.add_cycle(G, nlist) - assert_nodes_equal(G.nodes, self.Gnodes) - assert_edges_equal(G.edges, self.G.edges) + assert nodes_equal(G.nodes, self.Gnodes) + assert edges_equal(G.edges, self.G.edges) def test_subgraph(self): assert ( @@ -212,12 +212,12 @@ class TestFunction: def test_create_empty_copy(self): G = nx.create_empty_copy(self.G, with_data=False) - assert_nodes_equal(G, list(self.G)) + assert nodes_equal(G, list(self.G)) assert G.graph == {} assert G._node == {}.fromkeys(self.G.nodes(), {}) assert G._adj == {}.fromkeys(self.G.nodes(), {}) G = nx.create_empty_copy(self.G) - assert_nodes_equal(G, list(self.G)) + assert nodes_equal(G, list(self.G)) assert G.graph == self.G.graph assert G._node == self.G._node assert G._adj == {}.fromkeys(self.G.nodes(), {}) @@ -684,9 +684,9 @@ def test_is_empty(): def test_selfloops(graph_type): G = nx.complete_graph(3, create_using=graph_type) G.add_edge(0, 0) - assert_nodes_equal(nx.nodes_with_selfloops(G), [0]) - assert_edges_equal(nx.selfloop_edges(G), [(0, 0)]) - assert_edges_equal(nx.selfloop_edges(G, data=True), [(0, 0, {})]) + assert nodes_equal(nx.nodes_with_selfloops(G), [0]) + assert edges_equal(nx.selfloop_edges(G), [(0, 0)]) + assert edges_equal(nx.selfloop_edges(G, data=True), [(0, 0, {})]) assert nx.number_of_selfloops(G) == 1 @@ -697,17 +697,17 @@ def test_selfloop_edges_attr(graph_type): G = nx.complete_graph(3, create_using=graph_type) G.add_edge(0, 0) G.add_edge(1, 1, weight=2) - assert_edges_equal( + assert edges_equal( nx.selfloop_edges(G, data=True), [(0, 0, {}), (1, 1, {"weight": 2})] ) - assert_edges_equal(nx.selfloop_edges(G, data="weight"), [(0, 0, None), (1, 1, 2)]) + assert edges_equal(nx.selfloop_edges(G, data="weight"), [(0, 0, None), (1, 1, 2)]) def test_selfloop_edges_multi_with_data_and_keys(): G = nx.complete_graph(3, create_using=nx.MultiGraph) G.add_edge(0, 0, weight=10) G.add_edge(0, 0, weight=100) - assert_edges_equal( + assert edges_equal( nx.selfloop_edges(G, data="weight", keys=True), [(0, 0, 0, 10), (0, 0, 1, 100)], ) diff --git a/networkx/classes/tests/test_graph.py b/networkx/classes/tests/test_graph.py index 476f5e14..9b31cd5f 100644 --- a/networkx/classes/tests/test_graph.py +++ b/networkx/classes/tests/test_graph.py @@ -1,15 +1,10 @@ import pickle import gc import platform +import pytest import networkx as nx -from networkx.testing.utils import ( - assert_graphs_equal, - assert_edges_equal, - assert_nodes_equal, -) - -import pytest +from networkx.utils import nodes_equal, edges_equal, graphs_equal class BaseGraphTester: @@ -82,9 +77,9 @@ class BaseGraphTester: def test_edges(self): G = self.K3 - assert_edges_equal(G.edges(), [(0, 1), (0, 2), (1, 2)]) - assert_edges_equal(G.edges(0), [(0, 1), (0, 2)]) - assert_edges_equal(G.edges([0, 1]), [(0, 1), (0, 2), (1, 2)]) + assert edges_equal(G.edges(), [(0, 1), (0, 2), (1, 2)]) + assert edges_equal(G.edges(0), [(0, 1), (0, 2)]) + assert edges_equal(G.edges([0, 1]), [(0, 1), (0, 2), (1, 2)]) with pytest.raises(nx.NetworkXError): G.edges(-1) @@ -103,13 +98,13 @@ class BaseGraphTester: def test_nbunch_iter(self): G = self.K3 - assert_nodes_equal(G.nbunch_iter(), self.k3nodes) # all nodes - assert_nodes_equal(G.nbunch_iter(0), [0]) # single node - assert_nodes_equal(G.nbunch_iter([0, 1]), [0, 1]) # sequence + assert nodes_equal(G.nbunch_iter(), self.k3nodes) # all nodes + assert nodes_equal(G.nbunch_iter(0), [0]) # single node + assert nodes_equal(G.nbunch_iter([0, 1]), [0, 1]) # sequence # sequence with none in graph - assert_nodes_equal(G.nbunch_iter([-1]), []) + assert nodes_equal(G.nbunch_iter([-1]), []) # string sequence with none in graph - assert_nodes_equal(G.nbunch_iter("foo"), []) + assert nodes_equal(G.nbunch_iter("foo"), []) # node not in graph doesn't get caught upon creation of iterator bunch = G.nbunch_iter(-1) # but gets caught when iterator used @@ -146,8 +141,8 @@ class BaseGraphTester: def test_selfloops(self): G = self.K3.copy() G.add_edge(0, 0) - assert_nodes_equal(nx.nodes_with_selfloops(G), [0]) - assert_edges_equal(nx.selfloop_edges(G), [(0, 0)]) + assert nodes_equal(nx.nodes_with_selfloops(G), [0]) + assert edges_equal(nx.selfloop_edges(G), [(0, 0)]) assert nx.number_of_selfloops(G) == 1 G.remove_edge(0, 0) G.add_edge(0, 0) @@ -169,12 +164,12 @@ class BaseAttrGraphTester(BaseGraphTester): assert sorted(d for n, d in G.degree(weight="weight")) == [2, 3, 5] assert dict(G.degree(weight="weight")) == {1: 2, 2: 5, 3: 3} assert G.degree(1, weight="weight") == 2 - assert_nodes_equal((G.degree([1], weight="weight")), [(1, 2)]) + assert nodes_equal((G.degree([1], weight="weight")), [(1, 2)]) - assert_nodes_equal((d for n, d in G.degree(weight="other")), [3, 7, 4]) + assert nodes_equal((d for n, d in G.degree(weight="other")), [3, 7, 4]) assert dict(G.degree(weight="other")) == {1: 3, 2: 7, 3: 4} assert G.degree(1, weight="other") == 3 - assert_edges_equal((G.degree([1], weight="other")), [(1, 3)]) + assert edges_equal((G.degree([1], weight="other")), [(1, 3)]) def add_attributes(self, G): G.graph["foo"] = [] @@ -354,12 +349,12 @@ class BaseAttrGraphTester(BaseGraphTester): def test_node_attr(self): G = self.K3.copy() G.add_node(1, foo="bar") - assert_nodes_equal(G.nodes(), [0, 1, 2]) - assert_nodes_equal(G.nodes(data=True), [(0, {}), (1, {"foo": "bar"}), (2, {})]) + assert nodes_equal(G.nodes(), [0, 1, 2]) + assert nodes_equal(G.nodes(data=True), [(0, {}), (1, {"foo": "bar"}), (2, {})]) G.nodes[1]["foo"] = "baz" - assert_nodes_equal(G.nodes(data=True), [(0, {}), (1, {"foo": "baz"}), (2, {})]) - assert_nodes_equal(G.nodes(data="foo"), [(0, None), (1, "baz"), (2, None)]) - assert_nodes_equal( + assert nodes_equal(G.nodes(data=True), [(0, {}), (1, {"foo": "baz"}), (2, {})]) + assert nodes_equal(G.nodes(data="foo"), [(0, None), (1, "baz"), (2, None)]) + assert nodes_equal( G.nodes(data="foo", default="bar"), [(0, "bar"), (1, "baz"), (2, "bar")] ) @@ -367,34 +362,34 @@ class BaseAttrGraphTester(BaseGraphTester): G = self.K3.copy() a = {"foo": "bar"} G.add_node(3, **a) - assert_nodes_equal(G.nodes(), [0, 1, 2, 3]) - assert_nodes_equal( + assert nodes_equal(G.nodes(), [0, 1, 2, 3]) + assert nodes_equal( G.nodes(data=True), [(0, {}), (1, {}), (2, {}), (3, {"foo": "bar"})] ) def test_edge_lookup(self): G = self.Graph() G.add_edge(1, 2, foo="bar") - assert_edges_equal(G.edges[1, 2], {"foo": "bar"}) + assert edges_equal(G.edges[1, 2], {"foo": "bar"}) def test_edge_attr(self): G = self.Graph() G.add_edge(1, 2, foo="bar") - assert_edges_equal(G.edges(data=True), [(1, 2, {"foo": "bar"})]) - assert_edges_equal(G.edges(data="foo"), [(1, 2, "bar")]) + assert edges_equal(G.edges(data=True), [(1, 2, {"foo": "bar"})]) + assert edges_equal(G.edges(data="foo"), [(1, 2, "bar")]) def test_edge_attr2(self): G = self.Graph() G.add_edges_from([(1, 2), (3, 4)], foo="foo") - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"foo": "foo"}), (3, 4, {"foo": "foo"})] ) - assert_edges_equal(G.edges(data="foo"), [(1, 2, "foo"), (3, 4, "foo")]) + assert edges_equal(G.edges(data="foo"), [(1, 2, "foo"), (3, 4, "foo")]) def test_edge_attr3(self): G = self.Graph() G.add_edges_from([(1, 2, {"weight": 32}), (3, 4, {"weight": 64})], foo="foo") - assert_edges_equal( + assert edges_equal( G.edges(data=True), [ (1, 2, {"foo": "foo", "weight": 32}), @@ -404,27 +399,27 @@ class BaseAttrGraphTester(BaseGraphTester): G.remove_edges_from([(1, 2), (3, 4)]) G.add_edge(1, 2, data=7, spam="bar", bar="foo") - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 7, "spam": "bar", "bar": "foo"})] ) def test_edge_attr4(self): G = self.Graph() G.add_edge(1, 2, data=7, spam="bar", bar="foo") - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 7, "spam": "bar", "bar": "foo"})] ) G[1][2]["data"] = 10 # OK to set data like this - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 10, "spam": "bar", "bar": "foo"})] ) G.adj[1][2]["data"] = 20 - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 20, "spam": "bar", "bar": "foo"})] ) G.edges[1, 2]["data"] = 21 # another spelling, "edge" - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 21, "spam": "bar", "bar": "foo"})] ) G.adj[1][2]["listdata"] = [20, 200] @@ -436,7 +431,7 @@ class BaseAttrGraphTester(BaseGraphTester): "listdata": [20, 200], "weight": 20, } - assert_edges_equal(G.edges(data=True), [(1, 2, dd)]) + assert edges_equal(G.edges(data=True), [(1, 2, dd)]) def test_to_undirected(self): G = self.K3 @@ -474,10 +469,10 @@ class BaseAttrGraphTester(BaseGraphTester): G = self.K3.copy() G.add_edge(0, 0) G.add_edge(1, 1, weight=2) - assert_edges_equal( + assert edges_equal( nx.selfloop_edges(G, data=True), [(0, 0, {}), (1, 1, {"weight": 2})] ) - assert_edges_equal( + assert edges_equal( nx.selfloop_edges(G, data="weight"), [(0, 0, None), (1, 1, 2)] ) @@ -657,9 +652,9 @@ class TestGraph(BaseAttrGraphTester): def test_edges_data(self): G = self.K3 all_edges = [(0, 1, {}), (0, 2, {}), (1, 2, {})] - assert_edges_equal(G.edges(data=True), all_edges) - assert_edges_equal(G.edges(0, data=True), [(0, 1, {}), (0, 2, {})]) - assert_edges_equal(G.edges([0, 1], data=True), all_edges) + assert edges_equal(G.edges(data=True), all_edges) + assert edges_equal(G.edges(0, data=True), [(0, 1, {}), (0, 2, {})]) + assert edges_equal(G.edges([0, 1], data=True), all_edges) with pytest.raises(nx.NetworkXError): G.edges(-1, True) @@ -723,9 +718,9 @@ class TestGraph(BaseAttrGraphTester): GG = G.copy() H = self.Graph() GG.update(H) - assert_graphs_equal(G, GG) + assert graphs_equal(G, GG) H.update(G) - assert_graphs_equal(H, G) + assert graphs_equal(H, G) # update nodes only H = self.Graph() diff --git a/networkx/classes/tests/test_graphviews.py b/networkx/classes/tests/test_graphviews.py index 806117f0..15e37b4a 100644 --- a/networkx/classes/tests/test_graphviews.py +++ b/networkx/classes/tests/test_graphviews.py @@ -1,7 +1,7 @@ import pytest import networkx as nx -from networkx.testing import assert_edges_equal, assert_nodes_equal +from networkx.utils import nodes_equal, edges_equal # Note: SubGraph views are not tested here. They have their own testing file @@ -111,8 +111,8 @@ class TestToDirected: def test_already_directed(self): dd = nx.to_directed(self.dv) Mdd = nx.to_directed(self.Mdv) - assert_edges_equal(dd.edges, self.dv.edges) - assert_edges_equal(Mdd.edges, self.Mdv.edges) + assert edges_equal(dd.edges, self.dv.edges) + assert edges_equal(Mdd.edges, self.Mdv.edges) def test_pickle(self): import pickle @@ -150,8 +150,8 @@ class TestToUndirected: def test_already_directed(self): uu = nx.to_undirected(self.uv) Muu = nx.to_undirected(self.Muv) - assert_edges_equal(uu.edges, self.uv.edges) - assert_edges_equal(Muu.edges, self.Muv.edges) + assert edges_equal(uu.edges, self.uv.edges) + assert edges_equal(Muu.edges, self.Muv.edges) def test_pickle(self): import pickle @@ -207,8 +207,8 @@ class TestChainsOfViews: for G in self.graphs: H = pickle.loads(pickle.dumps(G, -1)) - assert_edges_equal(H.edges, G.edges) - assert_nodes_equal(H.nodes, G.nodes) + assert edges_equal(H.edges, G.edges) + assert nodes_equal(H.nodes, G.nodes) def test_subgraph_of_subgraph(self): SGv = nx.subgraph(self.G, range(3, 7)) @@ -239,19 +239,19 @@ class TestChainsOfViews: assert RG._graph is self.G assert SSG._graph is self.G assert SG._graph is RG - assert_edges_equal(SG.edges, SSG.edges) + assert edges_equal(SG.edges, SSG.edges) # should be same as morphing the graph CG = self.G.copy() CG.remove_nodes_from(hide_nodes) CG.remove_edges_from(hide_edges) - assert_edges_equal(CG.edges(nodes), SSG.edges) + assert edges_equal(CG.edges(nodes), SSG.edges) CG.remove_nodes_from([0, 1, 2, 3]) - assert_edges_equal(CG.edges, SSG.edges) + assert edges_equal(CG.edges, SSG.edges) # switch order: subgraph first, then restricted view SSSG = self.G.subgraph(nodes) RSG = nx.restricted_view(SSSG, hide_nodes, hide_edges) assert RSG._graph is not self.G - assert_edges_equal(RSG.edges, CG.edges) + assert edges_equal(RSG.edges, CG.edges) def test_subgraph_copy(self): for origG in self.graphs: diff --git a/networkx/classes/tests/test_multidigraph.py b/networkx/classes/tests/test_multidigraph.py index 2bf184c6..0e84890e 100644 --- a/networkx/classes/tests/test_multidigraph.py +++ b/networkx/classes/tests/test_multidigraph.py @@ -1,5 +1,5 @@ import pytest -from networkx.testing import assert_edges_equal +from networkx.utils import edges_equal import networkx as nx from .test_multigraph import BaseMultiGraphTester from .test_multigraph import TestMultiGraph as _TestMultiGraph @@ -156,9 +156,9 @@ class BaseMultiDiGraphTester(BaseMultiGraphTester): # the result is traversal order dependent so we # can't use the is_shallow() test here. try: - assert_edges_equal(H.edges(), [(0, 1), (1, 2), (2, 0)]) + assert edges_equal(H.edges(), [(0, 1), (1, 2), (2, 0)]) except AssertionError: - assert_edges_equal(H.edges(), [(0, 1), (1, 2), (1, 2), (2, 0)]) + assert edges_equal(H.edges(), [(0, 1), (1, 2), (1, 2), (2, 0)]) H = G.to_undirected() self.is_deep(H, G) diff --git a/networkx/classes/tests/test_multigraph.py b/networkx/classes/tests/test_multigraph.py index ec07c229..bf2e98e0 100644 --- a/networkx/classes/tests/test_multigraph.py +++ b/networkx/classes/tests/test_multigraph.py @@ -1,7 +1,7 @@ import pytest import networkx as nx -from networkx.testing.utils import assert_edges_equal +from networkx.utils import edges_equal from .test_graph import BaseAttrGraphTester from .test_graph import TestGraph as _TestGraph @@ -119,31 +119,31 @@ class BaseMultiGraphTester(BaseAttrGraphTester): G = self.Graph() G.add_edge(1, 2, foo="bar") G.add_edge(1, 2, "key", foo="biz") - assert_edges_equal(G.edges[1, 2, 0], {"foo": "bar"}) - assert_edges_equal(G.edges[1, 2, "key"], {"foo": "biz"}) + assert edges_equal(G.edges[1, 2, 0], {"foo": "bar"}) + assert edges_equal(G.edges[1, 2, "key"], {"foo": "biz"}) def test_edge_attr4(self): G = self.Graph() G.add_edge(1, 2, key=0, data=7, spam="bar", bar="foo") - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 7, "spam": "bar", "bar": "foo"})] ) G[1][2][0]["data"] = 10 # OK to set data like this - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 10, "spam": "bar", "bar": "foo"})] ) G.adj[1][2][0]["data"] = 20 - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 20, "spam": "bar", "bar": "foo"})] ) G.edges[1, 2, 0]["data"] = 21 # another spelling, "edge" - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"data": 21, "spam": "bar", "bar": "foo"})] ) G.adj[1][2][0]["listdata"] = [20, 200] G.adj[1][2][0]["weight"] = 20 - assert_edges_equal( + assert edges_equal( G.edges(data=True), [ ( |