pov: update tests to v1.2.0 (exercism#1339)

mrcfps · cmccandless · commit 2b922f0ba74b · 2018-02-19T08:32:31.000-06:00
* pov: update tests to v1.2.0

* Move utility `assertTreeEquals` to right place

* pov: apply 'snake_case' naming style
diff --git a/exercises/pov/example.py b/exercises/pov/example.py
@@ -41,7 +41,7 @@ def remove(self, node):
             tree.children.append(child.remove(node))
         return tree
 
-    def fromPov(self, from_node):
+    def from_pov(self, from_node):
         stack = [self]
         visited = set()
         while stack:
@@ -55,8 +55,8 @@ def fromPov(self, from_node):
                 stack.append(child.add(tree.remove(child.label)))
         raise ValueError("Tree could not be reoriented")
 
-    def pathTo(self, from_node, to_node):
-        reordered = self.fromPov(from_node)
+    def path_to(self, from_node, to_node):
+        reordered = self.from_pov(from_node)
         stack = reordered.children
         path = [from_node]
         while path[-1] != to_node:
diff --git a/exercises/pov/pov.py b/exercises/pov/pov.py
@@ -18,8 +18,8 @@ def __lt__(self, other):
     def __eq__(self, other):
         return self.__dict__() == other.__dict__()
 
-    def fromPov(self, from_node):
+    def from_pov(self, from_node):
         pass
 
-    def pathTo(self, from_node, to_node):
+    def path_to(self, from_node, to_node):
         pass
diff --git a/exercises/pov/pov_test.py b/exercises/pov/pov_test.py
@@ -3,16 +3,13 @@
 from pov import Tree
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.1.1
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.0
 
 class PovTest(unittest.TestCase):
-    def assertTreeEquals(self, result, expected):
-        self.assertEqual(result, expected,
-                         '{} != {}'.format(result, expected))
 
     def test_singleton_returns_same_tree(self):
         tree = Tree('x')
-        self.assertTreeEquals(tree.fromPov('x'), tree)
+        self.assertTreeEquals(tree.from_pov('x'), tree)
 
     def test_can_reroot_tree_with_parent_and_one_sibling(self):
         tree = Tree('parent', [
@@ -24,7 +21,7 @@ def test_can_reroot_tree_with_parent_and_one_sibling(self):
                 Tree('sibling')
             ])
         ])
-        self.assertTreeEquals(tree.fromPov('x'), expected)
+        self.assertTreeEquals(tree.from_pov('x'), expected)
 
     def test_can_reroot_tree_with_parent_and_many_siblings(self):
         tree = Tree('parent', [
@@ -40,7 +37,7 @@ def test_can_reroot_tree_with_parent_and_many_siblings(self):
                 Tree('c')
             ])
         ])
-        self.assertTreeEquals(tree.fromPov('x'), expected)
+        self.assertTreeEquals(tree.from_pov('x'), expected)
 
     def test_can_reroot_a_tree_with_new_root_deeply_nested(self):
         tree = Tree('level-0', [
@@ -61,7 +58,7 @@ def test_can_reroot_a_tree_with_new_root_deeply_nested(self):
                 ])
             ])
         ])
-        self.assertTreeEquals(tree.fromPov('x'), expected)
+        self.assertTreeEquals(tree.from_pov('x'), expected)
 
     def test_moves_children_of_new_root_to_same_level_as_former_parent(self):
         tree = Tree('parent', [
@@ -75,7 +72,7 @@ def test_moves_children_of_new_root_to_same_level_as_former_parent(self):
             Tree('kid-0'),
             Tree('kid-1')
         ])
-        self.assertTreeEquals(tree.fromPov('x'), expected)
+        self.assertTreeEquals(tree.from_pov('x'), expected)
 
     def test_can_reroot_complex_tree_with_cousins(self):
         tree = Tree('grandparent', [
@@ -106,12 +103,12 @@ def test_can_reroot_complex_tree_with_cousins(self):
                 ])
             ])
         ])
-        self.assertTreeEquals(tree.fromPov('x'), expected)
+        self.assertTreeEquals(tree.from_pov('x'), expected)
 
     def test_errors_if_target_does_not_exist_in_singleton_tree(self):
         tree = Tree('x')
         with self.assertRaisesWithMessage(ValueError):
-            tree.fromPov('nonexistent')
+            tree.from_pov('nonexistent')
 
     def test_errors_if_target_does_not_exist_in_large_tree(self):
         tree = Tree('parent', [
@@ -123,15 +120,15 @@ def test_errors_if_target_does_not_exist_in_large_tree(self):
             Tree('sibling-1')
         ])
         with self.assertRaisesWithMessage(ValueError):
-            tree.fromPov('nonexistent')
+            tree.from_pov('nonexistent')
 
     def test_find_path_between_two_nodes(self):
         tree = Tree('parent', [
             Tree('x'),
             Tree('sibling')
         ])
         expected = ['x', 'parent']
-        self.assertEqual(tree.pathTo('x', 'parent'), expected)
+        self.assertEqual(tree.path_to('x', 'parent'), expected)
 
     def test_can_find_path_to_sibling(self):
         tree = Tree('parent', [
@@ -141,7 +138,7 @@ def test_can_find_path_to_sibling(self):
             Tree('c')
         ])
         expected = ['x', 'parent', 'b']
-        self.assertEqual(tree.pathTo('x', 'b'), expected)
+        self.assertEqual(tree.path_to('x', 'b'), expected)
 
     def test_can_find_path_to_cousin(self):
         tree = Tree('grandparent', [
@@ -159,7 +156,7 @@ def test_can_find_path_to_cousin(self):
             ])
         ])
         expected = ['x', 'parent', 'grandparent', 'uncle', 'cousin-1']
-        self.assertEqual(tree.pathTo('x', 'cousin-1'), expected)
+        self.assertEqual(tree.path_to('x', 'cousin-1'), expected)
 
     def test_can_find_path_from_nodes_other_than_x(self):
         tree = Tree('parent', [
@@ -169,7 +166,7 @@ def test_can_find_path_from_nodes_other_than_x(self):
             Tree('c')
         ])
         expected = ['a', 'parent', 'c']
-        self.assertEqual(tree.pathTo('a', 'c'), expected)
+        self.assertEqual(tree.path_to('a', 'c'), expected)
 
     def test_errors_if_destination_does_not_exist(self):
         tree = Tree('parent', [
@@ -181,7 +178,7 @@ def test_errors_if_destination_does_not_exist(self):
             Tree('sibling-1')
         ])
         with self.assertRaisesWithMessage(ValueError):
-            tree.pathTo('x', 'nonexistent')
+            tree.path_to('x', 'nonexistent')
 
     def test_errors_if_source_does_not_exist(self):
         tree = Tree('parent', [
@@ -193,7 +190,7 @@ def test_errors_if_source_does_not_exist(self):
             Tree('sibling-1')
         ])
         with self.assertRaisesWithMessage(ValueError):
-            tree.pathTo('nonexistent', 'x')
+            tree.path_to('nonexistent', 'x')
 
     # Utility functions
     def setUp(self):
@@ -205,6 +202,10 @@ def setUp(self):
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
+    def assertTreeEquals(self, result, expected):
+        self.assertEqual(result, expected,
+                         '{} != {}'.format(result, expected))
+
 
 if __name__ == '__main__':
     unittest.main()
