diff options
Diffstat (limited to 'networkx/algorithms/bipartite/tests/test_edgelist.py')
-rw-r--r-- | networkx/algorithms/bipartite/tests/test_edgelist.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/networkx/algorithms/bipartite/tests/test_edgelist.py b/networkx/algorithms/bipartite/tests/test_edgelist.py index 2a8dc73e..80b2c098 100644 --- a/networkx/algorithms/bipartite/tests/test_edgelist.py +++ b/networkx/algorithms/bipartite/tests/test_edgelist.py @@ -7,7 +7,7 @@ import tempfile import os import networkx as nx -from networkx.testing import assert_edges_equal, assert_nodes_equal, assert_graphs_equal +from networkx.utils import nodes_equal, edges_equal, graphs_equal from networkx.algorithms import bipartite @@ -35,7 +35,7 @@ class TestEdgelist: """ bytesIO = io.BytesIO(s) G = bipartite.read_edgelist(bytesIO, nodetype=int) - assert_edges_equal(G.edges(), [(1, 2), (2, 3)]) + assert edges_equal(G.edges(), [(1, 2), (2, 3)]) def test_read_edgelist_3(self): s = b"""\ @@ -46,11 +46,11 @@ class TestEdgelist: """ bytesIO = io.BytesIO(s) G = bipartite.read_edgelist(bytesIO, nodetype=int, data=False) - assert_edges_equal(G.edges(), [(1, 2), (2, 3)]) + assert edges_equal(G.edges(), [(1, 2), (2, 3)]) bytesIO = io.BytesIO(s) G = bipartite.read_edgelist(bytesIO, nodetype=int, data=True) - assert_edges_equal( + assert edges_equal( G.edges(data=True), [(1, 2, {"weight": 2.0}), (2, 3, {"weight": 3.0})] ) @@ -110,7 +110,7 @@ class TestEdgelist: fd, fname = tempfile.mkstemp() bipartite.write_edgelist(G, fname) H = bipartite.read_edgelist(fname) - assert_graphs_equal(G, H) + assert graphs_equal(G, H) os.close(fd) os.unlink(fname) @@ -138,7 +138,7 @@ class TestEdgelist: fd, fname = tempfile.mkstemp() bipartite.write_edgelist(G, fname, encoding="latin-1") H = bipartite.read_edgelist(fname, encoding="latin-1") - assert_graphs_equal(G, H) + assert graphs_equal(G, H) os.close(fd) os.unlink(fname) @@ -150,8 +150,8 @@ class TestEdgelist: H2 = bipartite.read_edgelist(fname) assert H is not H2 # they should be different graphs G.remove_node("g") # isolated nodes are not written in edgelist - assert_nodes_equal(list(H), list(G)) - assert_edges_equal(list(H.edges()), list(G.edges())) + assert nodes_equal(list(H), list(G)) + assert edges_equal(list(H.edges()), list(G.edges())) os.close(fd) os.unlink(fname) @@ -162,8 +162,8 @@ class TestEdgelist: H = bipartite.read_edgelist(fname, nodetype=int) # isolated nodes are not written in edgelist G.remove_nodes_from(list(nx.isolates(G))) - assert_nodes_equal(list(H), list(G)) - assert_edges_equal(list(H.edges()), list(G.edges())) + assert nodes_equal(list(H), list(G)) + assert edges_equal(list(H.edges()), list(G.edges())) os.close(fd) os.unlink(fname) @@ -174,8 +174,8 @@ class TestEdgelist: H = bipartite.read_edgelist(fname, nodetype=int, create_using=nx.MultiGraph()) H2 = bipartite.read_edgelist(fname, nodetype=int, create_using=nx.MultiGraph()) assert H is not H2 # they should be different graphs - assert_nodes_equal(list(H), list(G)) - assert_edges_equal(list(H.edges()), list(G.edges())) + assert nodes_equal(list(H), list(G)) + assert edges_equal(list(H.edges()), list(G.edges())) os.close(fd) os.unlink(fname) |