diff options
Diffstat (limited to 'networkx/readwrite/tests/test_graphml.py')
| -rw-r--r-- | networkx/readwrite/tests/test_graphml.py | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/networkx/readwrite/tests/test_graphml.py b/networkx/readwrite/tests/test_graphml.py index 75f1a91b..fbbc1953 100644 --- a/networkx/readwrite/tests/test_graphml.py +++ b/networkx/readwrite/tests/test_graphml.py @@ -1,6 +1,6 @@ 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 from networkx.readwrite.graphml import GraphMLWriter import io import tempfile @@ -293,51 +293,51 @@ class TestReadGraphML(BaseGraphML): def test_read_simple_undirected_graphml(self): G = self.simple_undirected_graph H = nx.read_graphml(self.simple_undirected_fh) - assert_nodes_equal(G.nodes(), H.nodes()) - assert_edges_equal(G.edges(), H.edges()) + assert nodes_equal(G.nodes(), H.nodes()) + assert edges_equal(G.edges(), H.edges()) self.simple_undirected_fh.seek(0) PG = nx.parse_graphml(self.simple_undirected_data) - assert_nodes_equal(G.nodes(), PG.nodes()) - assert_edges_equal(G.edges(), PG.edges()) + assert nodes_equal(G.nodes(), PG.nodes()) + assert edges_equal(G.edges(), PG.edges()) def test_read_undirected_multigraph_graphml(self): G = self.undirected_multigraph H = nx.read_graphml(self.undirected_multigraph_fh) - assert_nodes_equal(G.nodes(), H.nodes()) - assert_edges_equal(G.edges(), H.edges()) + assert nodes_equal(G.nodes(), H.nodes()) + assert edges_equal(G.edges(), H.edges()) self.undirected_multigraph_fh.seek(0) PG = nx.parse_graphml(self.undirected_multigraph_data) - assert_nodes_equal(G.nodes(), PG.nodes()) - assert_edges_equal(G.edges(), PG.edges()) + assert nodes_equal(G.nodes(), PG.nodes()) + assert edges_equal(G.edges(), PG.edges()) def test_read_undirected_multigraph_no_multiedge_graphml(self): G = self.undirected_multigraph_no_multiedge H = nx.read_graphml(self.undirected_multigraph_no_multiedge_fh) - assert_nodes_equal(G.nodes(), H.nodes()) - assert_edges_equal(G.edges(), H.edges()) + assert nodes_equal(G.nodes(), H.nodes()) + assert edges_equal(G.edges(), H.edges()) self.undirected_multigraph_no_multiedge_fh.seek(0) PG = nx.parse_graphml(self.undirected_multigraph_no_multiedge_data) - assert_nodes_equal(G.nodes(), PG.nodes()) - assert_edges_equal(G.edges(), PG.edges()) + assert nodes_equal(G.nodes(), PG.nodes()) + assert edges_equal(G.edges(), PG.edges()) def test_read_undirected_multigraph_only_ids_for_multiedges_graphml(self): G = self.multigraph_only_ids_for_multiedges H = nx.read_graphml(self.multigraph_only_ids_for_multiedges_fh) - assert_nodes_equal(G.nodes(), H.nodes()) - assert_edges_equal(G.edges(), H.edges()) + assert nodes_equal(G.nodes(), H.nodes()) + assert edges_equal(G.edges(), H.edges()) self.multigraph_only_ids_for_multiedges_fh.seek(0) PG = nx.parse_graphml(self.multigraph_only_ids_for_multiedges_data) - assert_nodes_equal(G.nodes(), PG.nodes()) - assert_edges_equal(G.edges(), PG.edges()) + assert nodes_equal(G.nodes(), PG.nodes()) + assert edges_equal(G.edges(), PG.edges()) def test_read_attribute_graphml(self): G = self.attribute_graph H = nx.read_graphml(self.attribute_fh) - assert_nodes_equal(G.nodes(True), sorted(H.nodes(data=True))) + assert nodes_equal(G.nodes(True), sorted(H.nodes(data=True))) ge = sorted(G.edges(data=True)) he = sorted(H.edges(data=True)) for a, b in zip(ge, he): @@ -494,7 +494,7 @@ class TestReadGraphML(BaseGraphML): nx.write_graphml(G, fh) fh.seek(0) H = nx.read_graphml(fh, node_type=int) - assert_edges_equal(G.edges(data=True, keys=True), H.edges(data=True, keys=True)) + assert edges_equal(G.edges(data=True, keys=True), H.edges(data=True, keys=True)) assert G._adj == H._adj Gadj = { @@ -1073,9 +1073,9 @@ class TestWriteGraphML(BaseGraphML): H = nx.read_graphml(fh) fh.seek(0) - assert_nodes_equal(G.nodes(), H.nodes()) - assert_edges_equal(G.edges(), H.edges()) - assert_edges_equal(G.edges(data=True), H.edges(data=True)) + assert nodes_equal(G.nodes(), H.nodes()) + assert edges_equal(G.edges(), H.edges()) + assert edges_equal(G.edges(data=True), H.edges(data=True)) self.attribute_named_key_ids_fh.seek(0) xml = parse(fh) @@ -1118,9 +1118,9 @@ class TestWriteGraphML(BaseGraphML): H = nx.read_graphml(fh) fh.seek(0) - assert_nodes_equal(G.nodes(), H.nodes()) - assert_edges_equal(G.edges(), H.edges()) - assert_edges_equal(G.edges(data=True), H.edges(data=True)) + assert nodes_equal(G.nodes(), H.nodes()) + assert edges_equal(G.edges(), H.edges()) + assert edges_equal(G.edges(data=True), H.edges(data=True)) self.attribute_numeric_type_fh.seek(0) xml = parse(fh) @@ -1146,7 +1146,7 @@ class TestWriteGraphML(BaseGraphML): self.writer(G, fname) H = nx.read_graphml(fname) assert H.is_multigraph() - assert_edges_equal(G.edges(keys=True), H.edges(keys=True)) + assert edges_equal(G.edges(keys=True), H.edges(keys=True)) assert G._adj == H._adj os.close(fd) os.unlink(fname) @@ -1162,8 +1162,8 @@ class TestWriteGraphML(BaseGraphML): self.writer(G, fh) fh.seek(0) H = nx.read_graphml(fh, node_type=int) - assert_nodes_equal(G.nodes(), H.nodes()) - assert_edges_equal(G.edges(), H.edges()) + assert nodes_equal(G.nodes(), H.nodes()) + assert edges_equal(G.edges(), H.edges()) assert G.graph == H.graph def test_mixed_type_attributes(self): |