Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions test/h5cpp_tests/node_tests/link_iteration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ def test_direct_iteration(self):

links = [link.path.name for link in entry.links]

self.assertListEqual(links, ["data", "instrument", "sample"],
"Comparison of link names {}".format(links))
self.assertSetEqual(set(links),
set(["data", "instrument", "sample"]),
"Comparison of link names {}".format(links))

def test_recursive_iteration(self):

Expand All @@ -104,5 +105,5 @@ def test_recursive_iteration(self):
"detector_module_2",
"detector_module_3",
"sample"]
self.assertListEqual(links, refnames,
"Comparison of link names {}".format(links))
self.assertSetEqual(set(links), set(refnames),
"Comparison of link names {}".format(links))
15 changes: 11 additions & 4 deletions test/h5cpp_tests/node_tests/node_iterator_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ def test_immediate_children_iteration(self):

nodes = [node.link.path.name for node in entry.nodes]
refnames = ["data", "instrument", "sample"]
self.assertListEqual(nodes, refnames,
"Comparison of node names: {}".format(nodes))
self.assertSetEqual(set(nodes), set(refnames),
"Comparison of node names: {}".format(nodes))

def test_recursive_node_iteration(self):

Expand All @@ -123,8 +123,15 @@ def test_recursive_node_iteration(self):
h5cpp.Path("/entry/instrument/detector_2"),
h5cpp.Path("/entry/instrument/detector_2/data")
]
self.assertListEqual(
node_paths, paths, "Path comparison: {}".format(node_paths))
self.assertEqual(
len(paths), len(node_paths),
"Number of links comparison: {} == {}".format(len(paths),
len(node_paths)))

for path in paths:
self.assertTrue(
path in node_paths,
"Path comparison: {} in {}".format(path, node_paths))

def test_exists(self):

Expand Down
Loading