From e69b5002472d3af892eefb20e574ea5cbcefef27 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 30 Jan 2015 13:12:49 +0530 Subject: [PATCH] Add to context processor and menu test cases - Minor style updates to other tests --- plinth/tests/test_cfg.py | 40 ++++++++++++------------- plinth/tests/test_context_processors.py | 17 ++++++++++- plinth/tests/test_menu.py | 35 ++++++++++++++-------- 3 files changed, 58 insertions(+), 34 deletions(-) diff --git a/plinth/tests/test_cfg.py b/plinth/tests/test_cfg.py index 75590f60f..bb3fe7ec6 100644 --- a/plinth/tests/test_cfg.py +++ b/plinth/tests/test_cfg.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -# -*- mode: python; mode: auto-fill; fill-column: 80 -*- # # This file is part of Plinth. # @@ -15,6 +14,7 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +# import configparser import os @@ -45,35 +45,33 @@ class CfgTestCase(unittest.TestCase): cls.config_file = cfg.DEFAULT_CONFIG_FILE cls.directory = cfg.DEFAULT_ROOT else: - cls.directory = os.path.realpath(".") + cls.directory = os.path.realpath('.') cls.config_file = os.path.join(cls.directory, CONFIG_FILENAME) if not(os.path.isfile(cls.config_file)): raise FileNotFoundError('File {} could not be found.', format(CONFIG_FILENAME)) - #Tests - + # Tests def test_read_main_menu(self): """Verify that the cfg.main_menu container is initially empty.""" - # menu should be empty before... - self.assertTrue(len(cfg.main_menu.items) == 0) + # Menu should be empty before... + self.assertEqual(len(cfg.main_menu.items), 0) cfg.read() # ...and after reading the config file - self.assertTrue(len(cfg.main_menu.items) == 0) + self.assertEqual(len(cfg.main_menu.items), 0) def test_read_official_config_file(self): """Verify that the plinth.config file can be read correctly.""" + # Read the plinth.config file directly + parser = self.read_config_file(self.config_file) - # read the plinth.config file directly - parser = self.read_config_file(CfgTestCase.config_file) - - # read the plinth.config file via the cfg module + # Read the plinth.config file via the cfg module cfg.read() - # compare the two sets of configuration values + # Compare the two sets of configuration values. # Note that the count of items within each section includes the number - # of default items (1, for 'root') + # of default items (1, for 'root'). self.assertEqual(3, len(parser.items('Name'))) self.assertEqual(parser.get('Name', 'product_name'), cfg.product_name) self.assertEqual(parser.get('Name', 'box_name'), cfg.box_name) @@ -127,7 +125,7 @@ class CfgTestCase(unittest.TestCase): def read_config_file(self, file): """Read the configuration file independently from cfg.py.""" parser = configparser.ConfigParser( - defaults={'root': CfgTestCase.directory}) + defaults={'root': self.directory}) parser.read(file) return parser @@ -141,8 +139,8 @@ class CfgTestCase(unittest.TestCase): def rename_official_config_file(self): """Rename the official config file so that it can't be read.""" - shutil.move(CfgTestCase.config_file, - os.path.join(CfgTestCase.directory, SAVED_CONFIG_FILE)) + shutil.move(self.config_file, + os.path.join(self.directory, SAVED_CONFIG_FILE)) def replace_official_config_file(self, test_file): """Replace plinth.config with the specified test config file.""" @@ -150,14 +148,14 @@ class CfgTestCase(unittest.TestCase): test_data_directory = os.path.join(os.path.dirname( os.path.realpath(__file__)), 'data') shutil.copy2(os.path.join(test_data_directory, test_file), - CfgTestCase.config_file) + self.config_file) def restore_official_config_file(self): """Restore the official plinth.config file.""" - if os.path.isfile(CfgTestCase.config_file): - os.remove(CfgTestCase.config_file) - shutil.move(os.path.join(CfgTestCase.directory, SAVED_CONFIG_FILE), - CfgTestCase.config_file) + if os.path.isfile(self.config_file): + os.remove(self.config_file) + shutil.move(os.path.join(self.directory, SAVED_CONFIG_FILE), + self.config_file) if __name__ == '__main__': diff --git a/plinth/tests/test_context_processors.py b/plinth/tests/test_context_processors.py index ededea2eb..2fb4b5b23 100644 --- a/plinth/tests/test_context_processors.py +++ b/plinth/tests/test_context_processors.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -# -*- mode: python; mode: auto-fill; fill-column: 80 -*- # # This file is part of Plinth. # @@ -15,6 +14,7 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +# from django.http import HttpRequest import unittest @@ -44,6 +44,21 @@ class ContextProcessorsTestCase(unittest.TestCase): self.assertIsNotNone(urls) self.assertEqual(['/', '/aaa/', '/aaa/bbb/', '/aaa/bbb/ccc/'], urls) + def test_common_border_conditions(self): + """Verify that the 'common' functions works for border conditions.""" + request = HttpRequest() + request.path = '' + response = cp.common(request) + self.assertEqual([], response['active_menu_urls']) + + request.path = '/' + response = cp.common(request) + self.assertEqual(['/'], response['active_menu_urls']) + + request.path = '/aaa/bbb' + response = cp.common(request) + self.assertEqual(['/', '/aaa/'], response['active_menu_urls']) + if __name__ == '__main__': unittest.main() diff --git a/plinth/tests/test_menu.py b/plinth/tests/test_menu.py index 8f73ca3f2..749891a12 100644 --- a/plinth/tests/test_menu.py +++ b/plinth/tests/test_menu.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -# -*- mode: python; mode: auto-fill; fill-column: 80 -*- # # This file is part of Plinth. # @@ -15,6 +14,7 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +# from django.http import HttpRequest import random @@ -80,8 +80,9 @@ class MenuTestCase(unittest.TestCase): # Verify that the order of every item is equal to or greater # than the order of the item preceding it - for i in range(1, 5): - self.assertTrue(menu.items[i].order >= menu.items[i-1].order) + for index in range(1, 5): + self.assertGreaterEqual(menu.items[index].order, + menu.items[index - 1].order) @unittest.skip('requires configuring Django beforehand') def test_add_urlname(self): @@ -108,27 +109,37 @@ class MenuTestCase(unittest.TestCase): """Verify that an active menu item can be correctly retrieved.""" menu = self.build_menu() - for i in range(1, 8): + for index in range(1, 8): request = HttpRequest() - request.path = URL_TEMPLATE.format(i, i, i) + request.path = URL_TEMPLATE.format(index, index, index) item = menu.active_item(request) - if i <= 5: - self.assertEqual('Item' + str(i), item.label) + if index <= 5: + self.assertEqual('Item' + str(index), item.label) self.assertEqual(request.path, item.url) else: self.assertIsNone(item) + def test_active_item_when_inside_subpath(self): + """Verify that the current URL could be a sub-path of menu item.""" + menu = self.build_menu() + expected_url = URL_TEMPLATE.format(1, 1, 1) + request = HttpRequest() + request.path = expected_url + 'd/e/f/' + item = menu.active_item(request) + self.assertEqual('Item1', item.label) + self.assertEqual(expected_url, item.url) + # Helper methods def build_menu(self, size=5): """Build a menu with the specified number of items.""" random.seed() item_data = [] - for i in range(1, size+1): - item_data.append(['Item' + str(i), - 'Icon' + str(i), - URL_TEMPLATE.format(i, i, i), - random.randint(0, 100)]) + for index in range(1, size + 1): + item_data.append(['Item' + str(index), + 'Icon' + str(index), + URL_TEMPLATE.format(index, index, index), + random.randint(0, 1000)]) menu = Menu() for data in item_data: menu.add_item(data[0], data[1], data[2], data[3])