R upgrade from python 2 to python 3, which caused file path modifications

Author: Pipeline

Infrastructure/TipsManager.py

@@ -7,10 +7,13 @@
 
 class TipsManager(object):
     def __init__(self, seed=None, root_directory=sys.argv[0]):
-        self.root_directory = "/".join(root_directory.split('/')[:-1])
+        self.root_directory = self.go_up_dir(root_directory)
         if seed is not None:
             random.seed(seed)
 
+    def go_up_dir(self, root_directory):
+        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/CountdownManager/test_CountdownManager.py

@@ -1,13 +1,11 @@
-import datetime
-import time
 import unittest
 
 from approvaltests.approvals import verify
 
 from Infrastructure.CountdownManager import CountdownManager
 
 
-class test_CountdownManager(unittest.TestCase):
+class TestsCountdownManager(unittest.TestCase):
 
     def test_set_countdown_timer(self):
         countdown_manager = CountdownManager(None)

tests/Infrastructure/CountdownManager/test_CountdownManager.test_subscribe_to_time_changes.approved.txt

@@ -1,15 +1,10 @@
-import os
 import random
 import unittest
-from approvaltests import Approvals
-from approvaltests.GenericDiffReporterFactory import GenericDiffReporterFactory
+from approvaltests.approvals import verify
 from Infrastructure.MobberManager import MobberManager
 
 
 class TestsMobberManager(unittest.TestCase):
-    def setUp(self):
-        self.reporter = GenericDiffReporterFactory().get_first_working()
-
     def test_empty_mobber_manager_has_no_items(self):
         mobber_manager = MobberManager()
         self.assertEqual(mobber_manager.mobber_count(), 0)
@@ -148,7 +143,7 @@ def time_change_callback(mobber_list, driver_index, navigator_index):
         mobber_manager.remove_mobber(0)
         mobber_manager.remove_mobber(0)
 
-        Approvals.verify(result["result"], self.reporter)
+        verify(result["result"])
 
     def test_subscribe_to_mobber_list_changes_random(self):
         random.seed(0)
@@ -193,7 +188,7 @@ def time_change_callback(mobber_list, driver_index, navigator_index):
         mobber_manager.remove_mobber(0)
         mobber_manager.remove_mobber(0)
 
-        Approvals.verify(result["result"], self.reporter)
+        verify(result["result"])
 
     def test_navigator1_driver0_index(self):
         mobber_manager = MobberManager()

…ture/MobberManager/TestsMobberManager.py …ture/MobberManager/test_MobberManager.pytests/Infrastructure/MobberManager/TestsMobberManager.py renamed to tests/Infrastructure/MobberManager/test_MobberManager.py tests/Infrastructure/MobberManager/TestsMobberManager.py renamed to tests/Infrastructure/MobberManager/test_MobberManager.py

@@ -14,4 +14,4 @@ Time Options after Change:
  Change 13| 11:45
  Change 14| 12:45
  Change 15| 13:45
- Change 16| 03:14
+ Change 16| 03:14

…re/SessionManager/TestsSessionManager.py …re/SessionManager/test_SessionManager.pytests/Infrastructure/SessionManager/TestsSessionManager.py renamed to tests/Infrastructure/SessionManager/test_SessionManager.py tests/Infrastructure/SessionManager/TestsSessionManager.py renamed to tests/Infrastructure/SessionManager/test_SessionManager.py

@@ -1,15 +1,12 @@
 import os
 import unittest
 
-from approvaltests import Approvals
-from approvaltests.GenericDiffReporterFactory import GenericDiffReporterFactory
+from approvaltests.approvals import verify
 
 from Infrastructure.TimeSettingsManager import TimeSettingsManager
 
 
 class TestsTimeOptionsManager(unittest.TestCase):
-    def setUp(self):
-        self.reporter = GenericDiffReporterFactory().get_first_working()
 
     def test_default_time_10_minutes(self):
         time_options_manager = TimeSettingsManager()
@@ -96,7 +93,7 @@ def time_change_callback(time, minutes, seconds,origin_station_name):
         time_options_manager.increment_minutes()
         time_options_manager.set_countdown_time(3, 14)
 
-        Approvals.verify(result["result"], self.reporter)
+        verify(result["result"])
 
 if __name__ == '__main__':
     os.environ["APPROVALS_TEXT_DIFF_TOOL"] = "meld"

tests/Infrastructure/TimeOptionsManager/TestsTimeOptionsManager.test_subscribe_to_time_changes_complex.approved.txt

@@ -2,19 +2,28 @@
 
 import sys
 
+import os
 from Infrastructure.TipsManager import TipsManager
 
 
 class TestsTipsManage(unittest.TestCase):
     def test_random_tip_from_file(self):
         seed = 0
-        tips_manager = TipsManager(seed,sys.path[1])
+
+        dirname = os.path.dirname(__file__)
+        path = self.go_two_dirs_up(dirname) + "/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
-        tips_manager = TipsManager(seed,sys.path[1])
+        dirname = os.path.dirname(__file__)
+        path = self.go_two_dirs_up(dirname) + "/Tips"
+        tips_manager = TipsManager(seed, path)
         result = tips_manager.get_random_tip()
         self.assertEqual(result, 'TestTips.txt: Customer collaboration over contract negotiation\n')