Removed redundant tests

Author: idle-code

tests/action_tests/GetActionTests.py

@@ -2,7 +2,6 @@
 
 from Node import Node
 from NodePath import NodePath
-from TreeRoot import TreeRoot
 from actions.BasicActions import GetAction
 
 
@@ -15,37 +14,18 @@ def setUp(self):
 
         self.get = GetAction()
 
-    def test_get(self):
+    def test_action_name(self):
+        self.assertEqual(NodePath('get'), self.get.path)
+
+    def test_normal_usage(self):
         self.assertEqual(123, self.get(self.root['integer']))
         self.assertEqual('foobar', self.get(self.root['string']))
         self.assertEqual(None, self.get(self.root['empty']))
 
-    def test_get_any_arguments(self):
+    def test_surplus_arguments(self):
         with self.assertRaises(TypeError):
             self.get(self.root['empty'], 1 ,2 ,3)
 
 
-class GetActionNodeTests(unittest.TestCase):
-    def setUp(self):
-        self.root = TreeRoot()
-        self.root.create('.integer', 123)
-        self.root.create('.string', 'foobar')
-        self.root.create('.empty')
-
-    def test_get(self):
-        integer = self.root.execute('.integer', NodePath('get'))
-        self.assertEqual(123, integer)
-
-        string = self.root.execute('.string', NodePath('get'))
-        self.assertEqual('foobar', string)
-
-        empty = self.root.execute('.empty', NodePath('get'))
-        self.assertEqual(None, empty)
-
-    def test_get_any_arguments(self):
-        with self.assertRaises(TypeError):
-            self.root.execute('.', NodePath('get'), 3, 2, 1)
-
-
 if __name__ == '__main__':
     unittest.main()

tests/action_tests/ListActionTests.py

@@ -2,7 +2,6 @@
 
 from Node import Node
 from NodePath import NodePath
-from TreeRoot import TreeRoot
 from actions.BasicActions import ListAction
 
 
@@ -14,56 +13,32 @@ def setUp(self):
 
         self.list = ListAction()
 
-    def test_list_all_empty(self):
+    def test_action_names(self):
+        self.assertEqual(NodePath('list'), self.list.path)
+        self.assertEqual(NodePath('all'), self.list.list_all.path)
+        self.assertEqual(NodePath('nodes'), self.list.list_nodes.path)
+        self.assertEqual(NodePath('attributes'), self.list.list_attributes.path)
+
+    def test_all_empty(self):
         empty_list = self.list.list_all(Node())
         self.assertListEqual([], empty_list)
 
-    def test_list_all_nodes_and_attributes(self):
+    def test_all_nodes_and_attributes(self):
         root_list = self.list.list_all(self.root)
         self.assertListEqual(['@attribute', 'empty'], root_list)
 
-    def test_list_nodes(self):
+    def test_nodes(self):
         root_list = self.list.list_nodes(self.root)
         self.assertListEqual(['empty'], root_list)
 
-    def test_list_attributes(self):
+    def test_attributes(self):
         root_list = self.list.list_attributes(self.root)
         self.assertListEqual(['@attribute'], root_list)
 
-    def test_list_default(self):
+    def test_default(self):
         root_list = self.list(self.root)
         self.assertListEqual(['empty'], root_list)
 
 
-class ListActionNodeTests(unittest.TestCase):
-    def setUp(self):
-        self.root = TreeRoot()
-        self.root.create('.test')
-        self.root.create('.test.@attribute', 'AAA')
-        self.root.create('.test.empty', '')
-
-        # Note: ListAction should be already present in TreeRoot
-
-    def test_list_all_empty(self):
-        empty_list = self.root.execute('.test.empty', NodePath('list.all'))
-        self.assertListEqual([], empty_list)
-
-    def test_list_all_nodes_and_attributes(self):
-        root_list = self.root.execute('.test', NodePath('list.all'))
-        self.assertListEqual(['@attribute', 'empty'], root_list)
-
-    def test_list_nodes(self):
-        root_list = self.root.execute('.test', NodePath('list.nodes'))
-        self.assertListEqual(['empty'], root_list)
-
-    def test_list_attributes(self):
-        root_list = self.root.execute('.test', NodePath('list.attributes'))
-        self.assertListEqual(['@attribute'], root_list)
-
-    def test_list_default(self):
-        root_list = self.root.execute('.test', NodePath('list'))
-        self.assertListEqual(['empty'], root_list)
-
-
 if __name__ == '__main__':
     unittest.main()

tests/action_tests/SetActionTests.py

@@ -2,7 +2,6 @@
 
 from Node import Node
 from NodePath import NodePath
-from TreeRoot import TreeRoot
 from actions.BasicActions import SetAction
 
 
@@ -15,13 +14,16 @@ def setUp(self):
 
         self.set = SetAction()
 
-    def test_set(self):
+    def test_action_name(self):
+        self.assertEqual(NodePath('set'), self.set.path)
+
+    def test_normal_usage(self):
         self.set(self.root['integer'], 321)
         self.assertEqual(321, self.root['integer'].get())
         self.set(self.root['string'], 'barfoo')
         self.assertEqual('barfoo', self.root['string'].get())
 
-    def test_set_different_type(self):
+    def test_different_type(self):
         with self.assertRaises(TypeError):
             self.set(self.root['integer'], 'string')
 
@@ -30,38 +32,10 @@ def test_set_none(self):
         with self.assertRaises(TypeError):
             self.set(self.root['empty'], 23)
 
-    def test_set_too_many_arguments(self):
+    def test_too_many_arguments(self):
         with self.assertRaises(TypeError):
             self.set(self.root['integer'], 1, 2, 3)
 
 
-class SetActionNodeTests(unittest.TestCase):
-    def setUp(self):
-        self.root = TreeRoot()
-        self.root.create('.integer', 123)
-        self.root.create('.string', 'foobar')
-        self.root.create('.empty')
-
-    def test_set(self):
-        self.root.execute('.integer', NodePath('set'), 444)
-        self.assertEqual(444, self.root.get('.integer'))
-
-        self.root.execute('.string', NodePath('set'), 'barfoo')
-        self.assertEqual('barfoo', self.root.get('.string'))
-
-    def test_set_different_type(self):
-        with self.assertRaises(TypeError):
-            self.root.execute('.integer', NodePath('set'), 'string')
-
-    def test_set_none(self):
-        # This behaviour is subject to change
-        with self.assertRaises(TypeError):
-            self.root.execute('.empty', NodePath('set'), 444)
-
-    def test_set_any_arguments(self):
-        with self.assertRaises(TypeError):
-            self.root.execute('.integer', NodePath('set'), 3, 2, 1)
-
-
 if __name__ == '__main__':
     unittest.main()