Merge pull request #78 from azavea/rde/fix/walk

Fix issue with iteration of children in catalog.walk

Author: lossyrob

pystac/catalog.py

@@ -475,7 +475,7 @@ def walk(self):
         items = self.get_items()
 
         yield (self, children, items)
-        for child in children:
+        for child in self.get_children():
             yield from child.walk()
 
     def _object_links(self):

tests/test_catalog.py

@@ -104,6 +104,35 @@ def test_clear_children_removes_from_cache(self):
         self.assertEqual(len(children), 1)
         self.assertEqual(children[0].description, 'test3')
 
+    def test_walk_iterates_correctly(self):
+        catalogs = [
+            TestCases.test_case_1(),
+            TestCases.test_case_2(),
+            TestCases.test_case_3()
+        ]
+
+        def test_catalog(cat):
+            expected_catalog_iterations = 1
+            actual_catalog_iterations = 0
+            with self.subTest(title='Testing catalog {}'.format(cat.id)):
+                for root, children, items in cat.walk():
+                    actual_catalog_iterations += 1
+                    expected_catalog_iterations += len(
+                        list(root.get_children()))
+
+                    self.assertEqual(set([c.id for c in root.get_children()]),
+                                     set([c.id for c in children]),
+                                     'Children unequal')
+                    self.assertEqual(set([c.id for c in root.get_items()]),
+                                     set([c.id for c in items]),
+                                     'Items unequal')
+
+                self.assertEqual(actual_catalog_iterations,
+                                 expected_catalog_iterations)
+
+        for cat in catalogs:
+            test_catalog(cat)
+
     def test_clone_generates_correct_links(self):
         catalogs = [
             TestCases.test_case_1(),