Tests use the correct directory for tips

Author: DeadlyApps

Infrastructure/PathUtility.py

@@ -4,12 +4,11 @@
 
 class PathUtility(object):
     @staticmethod
-    def normalize_path(path):
-
+    def normalize_path(path, root=sys.argv[0]):
+        path = path.replace('\\', '/')
         if not path.startswith("/"):
             path = "/" + path
-        # if sys.frozen == 'macosx_app':
-        #     path = path + "/Resources/"
-        path = path.replace('\\','/')
-        result = os.path.dirname(sys.argv[0]) + path
-        return result
+        dirname = os.path.dirname(root)
+        path = dirname + path
+        path = path.replace('\\', '/')
+        return path

Infrastructure/TimeSettingsManager.py

@@ -21,7 +21,7 @@ def increment_seconds(self, increment = 15):
         self.seconds = (self.seconds + increment) % 60
         self.fire_time_change_callbacks()
 
-    def decrement_seconds(self, decrement=60):
+    def decrement_seconds(self, decrement=15):
         self.seconds = ((self.seconds - decrement) % 60)
         self.fire_time_change_callbacks()
 

Infrastructure/TipsManager.py

@@ -1,17 +1,20 @@
 import os, random
 
+import sys
+
 from Infrastructure.PathUtility import PathUtility
 
 
 class TipsManager(object):
-    def __init__(self, seed = None):
+    def __init__(self, seed = None, root_directory=sys.argv[0]):
+        self.root_directory = root_directory
         if seed is not None:
             random.seed(seed)
 
     def get_random_tip(self):
         tips_folder = "Tips"
         random_file = random.choice(os.listdir("%s" % tips_folder))
-        return "{}: {}" .format(random_file, TipsManager.random_line(PathUtility.normalize_path(tips_folder + "\\" + random_file)))
+        return "{}: {}" .format(random_file, TipsManager.random_line(PathUtility.normalize_path(tips_folder + "\\" + random_file,self.root_directory)))
 
     @staticmethod
     def random_line(file_name):

tests/Infrastructure/TimeOptionsManager/TestsTimeOptionsManager.py

@@ -52,7 +52,7 @@ def test_decrement_seconds_3_times_is_10_minutes_45_seconds(self):
         time_options_manager.decrement_seconds(1)
         time_options_manager.decrement_seconds()
         result = time_options_manager.get_time_string()
-        self.assertEqual(result, "10:16")
+        self.assertEqual(result, "10:29")
 
     def test_subscribe_to_time_changes(self):
         time_options_manager = TimeSettingsManager()

tests/Infrastructure/TipsManager/TestTipsManager.py

@@ -1,18 +1,20 @@
 import unittest
 
+import sys
+
 from Infrastructure.TipsManager import TipsManager
 
 
 class TestsTipsManage(unittest.TestCase):
     def test_random_tip_from_file(self):
         seed = 0
-        tips_manager = TipsManager(seed)
+        tips_manager = TipsManager(seed,sys.argv[1])
         result = tips_manager.get_random_tip()
         self.assertEqual(result, 'TestTips2.txt: Words\n')
 
     def test_random_tip_from_file_second(self):
         seed = 1
-        tips_manager = TipsManager(seed)
+        tips_manager = TipsManager(seed,sys.argv[1])
         result = tips_manager.get_random_tip()
         self.assertEqual(result, 'TestTips.txt: Customer collaboration over contract negotiation\n')