raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

removed useless code

Browse Source
This commit is contained in:
Andreas Preikschat 2014-04-26 19:31:59 +02:00
parent 66c1f7c5da
commit 911864a442
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/utils/actions.py
View File

@ -65,12 +65,6 @@ class CategoryActionList(object):
self.index = 0
self.actions = []
def __getitem__(self, key):
"""
Implement the __getitem__() method to make this class a dictionary type
"""
return self.actions[key][1]
def __contains__(self, key):
"""
Implement the __contains__() method to make this class a dictionary type

24
tests/functional/openlp_core_utils/test_actions.py
View File

@ -57,22 +57,6 @@ class TestCategoryActionList(TestCase):
"""
del self.list
def get_test(self):
"""
Test the __getitem__() method
"""
# GIVEN: The list.
self.list.append(self.action1)
# WHEN: Add an action.
returned_action = self.list[0]
# THEN: Check if the correct action was returned.
self.assertEqual(self.action1, returned_action)
# THEN: Test if an exception is raised when trying to access a non existing item.
self.assertRaises(IndexError, self.list.__getitem__, 1)
def contains_test(self):
"""
Test the __contains__() method
@ -113,8 +97,8 @@ class TestCategoryActionList(TestCase):
# THEN: Check if the actions are in the list and check if they have the correct weights.
self.assertTrue(self.action1 in self.list)
self.assertTrue(self.action2 in self.list)
self.assertEqual(self.list[0], self.action1)
self.assertEqual(self.list[1], self.action2)
self.assertEqual(self.list.actions[0], (0, self.action1))
self.assertEqual(self.list.actions[1], (1, self.action2))
def add_test(self):
"""
@ -132,8 +116,8 @@ class TestCategoryActionList(TestCase):
self.assertTrue(self.action1 in self.list)
self.assertTrue(self.action2 in self.list)
# Now check if action1 is second and action2 is first (due to their weights).
self.assertEqual(self.list[0], self.action2)
self.assertEqual(self.list[1], self.action1)
self.assertEqual(self.list.actions[0], (41, self.action2))
self.assertEqual(self.list.actions[1], (42, self.action1))
def remove_test(self):
"""