r refactored navigating directories to allow levels of directories to navigate to be specified and removed duplicate code

Author: Pipeline

Infrastructure/EventLoggingManager.py

@@ -5,7 +5,7 @@ class EventLoggingManager:
 
     def __init__(self, file_utility):
         self.file_utility = file_utility
-        self.file_path = self.file_utility.go_up_dir(self.file_utility.get_root_path()) + "\\MobTimerEvents.log"
+        self.file_path = self.file_utility.go_up_dirs(self.file_utility.get_root_path(), 1) + "\\MobTimerEvents.log"
 
         if not self.file_utility.file_exists(self.file_path):
             self.file_utility.create_file(self.file_path)

Infrastructure/FileUtilities.py

@@ -28,8 +28,8 @@ def append(self, file_path, data):
         f.write(data)
         f.close()
 
-    def go_up_dir(self, root_directory):
+    def go_up_dirs(self, root_directory, levels):
         if '\\' in root_directory:
-            return "/".join(root_directory.split('\\')[:-1])
+            return "/".join(root_directory.split('\\')[:-levels])
         else:
-            return "/".join(root_directory.split('/')[:-1])
+            return "/".join(root_directory.split('/')[:-levels])

Infrastructure/TipsManager.py

@@ -2,22 +2,17 @@
 
 import sys
 
+from Infrastructure.FileUtilities import FileUtilities
 from Infrastructure.PathUtility import PathUtility
 
 
 class TipsManager(object):
     def __init__(self, seed=None, root_directory=sys.argv[0]):
-        self.root_directory = self.go_up_dir(root_directory)
+        self.file_utility = FileUtilities()
+        self.root_directory = self.file_utility.go_up_dirs(root_directory, 1)
         if seed is not None:
             random.seed(seed)
 
-    def go_up_dir(self, root_directory):
-        if '\\' in root_directory:
-            return "/".join(root_directory.split('\\')[:-1])
-        else:
-            return "/".join(root_directory.split('/')[:-1])
-
-
     def get_random_tip(self):
         tips_folder = self.root_directory + "/Tips"
         random_file = random.choice(os.listdir("%s" % tips_folder))

tests/Infrastructure/TipsManager/test_TipsManager.py

@@ -3,34 +3,39 @@
 import sys
 
 import os
+
+from Infrastructure.FileUtilities import FileUtilities
 from Infrastructure.TipsManager import TipsManager
 
 
 class TestsTipsManage(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.fileUtilities = FileUtilities()
+
     def test_random_tip_from_file(self):
         seed = 0
 
         dirname = os.path.dirname(__file__)
-        path = self.go_two_dirs_up(dirname) + "\\Tips"
+        path = self.fileUtilities.go_up_dirs(dirname, 2) + "\\Tips"
         tips_manager = TipsManager(seed, path)
         result = tips_manager.get_random_tip()
         self.assertEqual(result, 'TestTips2.txt: Words\n')
 
-    def go_two_dirs_up(self, dirname):
-        return "\\".join(dirname.split('\\')[:-2])
 
     def test_random_tip_from_file_second(self):
         seed = 1
         dirname = os.path.dirname(__file__)
-        path = self.go_two_dirs_up(dirname) + "\\Tips"
+        path = self.fileUtilities.go_up_dirs(dirname, 2) + "\\Tips"
         tips_manager = TipsManager(seed, path)
         result = tips_manager.get_random_tip()
         self.assertEqual(result, 'TestTips.txt: Customer collaboration over contract negotiation\n')
 
     def test_random_tip_from_file_second_alternate_slashes(self):
         seed = 1
         dirname = os.path.dirname(__file__)
-        path = self.go_two_dirs_up(dirname) + "\\Tips"
+        path = self.fileUtilities.go_up_dirs(dirname, 2) + "\\Tips"
         path = path.replace("\\", "/")
         tips_manager = TipsManager(seed, path)
         result = tips_manager.get_random_tip()