|  | @@ -3,7 +3,13 @@ from src.settings_manager import settings_manager
 | 
											
												
													
														|  |  import unittest, os, random
 |  |  import unittest, os, random
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +def read_file(filename):
 | 
											
												
													
														|  | 
 |  | +    with open(filename, 'r') as f:
 | 
											
												
													
														|  | 
 |  | +        return f.read()
 | 
											
												
													
														|  | 
 |  | +    
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  class test_settings(unittest.TestCase):
 |  |  class test_settings(unittest.TestCase):
 | 
											
												
													
														|  | 
 |  | +    projdir = os.path.dirname(__file__) + "/.."
 | 
											
												
													
														|  |      
 |  |      
 | 
											
												
													
														|  |      
 |  |      
 | 
											
												
													
														|  |      #
 |  |      #
 | 
											
										
											
												
													
														|  | @@ -41,7 +47,7 @@ class test_settings(unittest.TestCase):
 | 
											
												
													
														|  |          man = settings_manager()
 |  |          man = settings_manager()
 | 
											
												
													
														|  |          
 |  |          
 | 
											
												
													
														|  |          # Действие
 |  |          # Действие
 | 
											
												
													
														|  | -        result = man.open(f"{os.curdir}/../cfg/settings.json")
 |  | 
 | 
											
												
													
														|  | 
 |  | +        result = man.open(f"{self.projdir}/cfg/settings.json")
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          # Проверка
 |  |          # Проверка
 | 
											
												
													
														|  |          assert result == True
 |  |          assert result == True
 | 
											
										
											
												
													
														|  | @@ -56,7 +62,7 @@ class test_settings(unittest.TestCase):
 | 
											
												
													
														|  |          settings = None
 |  |          settings = None
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          # Действие
 |  |          # Действие
 | 
											
												
													
														|  | -        man.open(f"{os.curdir}/../cfg/settings.json")
 |  | 
 | 
											
												
													
														|  | 
 |  | +        man.open(f"{self.projdir}/cfg/settings.json")
 | 
											
												
													
														|  |          man.convert()
 |  |          man.convert()
 | 
											
												
													
														|  |          settings = man.settings
 |  |          settings = man.settings
 | 
											
												
													
														|  |          dict = settings.__dict__
 |  |          dict = settings.__dict__
 | 
											
										
											
												
													
														|  | @@ -72,17 +78,17 @@ class test_settings(unittest.TestCase):
 | 
											
												
													
														|  |      #
 |  |      #
 | 
											
												
													
														|  |      def test_settings_any_filename(self):
 |  |      def test_settings_any_filename(self):
 | 
											
												
													
														|  |          # Подготовка
 |  |          # Подготовка
 | 
											
												
													
														|  | -        if not os.path.exists("..\\.test_data"):
 |  | 
 | 
											
												
													
														|  | -            os.mkdir("..\\.test_data")
 |  | 
 | 
											
												
													
														|  | 
 |  | +        if not os.path.exists(f"{self.projdir}/.test_data"):
 | 
											
												
													
														|  | 
 |  | +            os.mkdir(f"{self.projdir}/.test_data")
 | 
											
												
													
														|  |          alp = "abcdefghijklmnopqrstuvwxyz"
 |  |          alp = "abcdefghijklmnopqrstuvwxyz"
 | 
											
												
													
														|  | -        dirname = f"{os.getcwd()}\\..\\.test_data\\"
 |  | 
 | 
											
												
													
														|  | 
 |  | +        dirname = f"{self.projdir}/.test_data/"
 | 
											
												
													
														|  |          dirname += ''.join(random.choice(alp) for _ in range(6))
 |  |          dirname += ''.join(random.choice(alp) for _ in range(6))
 | 
											
												
													
														|  | -        filename = f"{dirname}\\"
 |  | 
 | 
											
												
													
														|  | 
 |  | +        filename = f"{dirname}/"
 | 
											
												
													
														|  |          filename += ''.join(random.choice(alp) for _ in range(6)) + ".json"
 |  |          filename += ''.join(random.choice(alp) for _ in range(6)) + ".json"
 | 
											
												
													
														|  |          os.mkdir(dirname)
 |  |          os.mkdir(dirname)
 | 
											
												
													
														|  |          print(filename)
 |  |          print(filename)
 | 
											
												
													
														|  |          f = open(filename, "w", encoding="UTF-8")
 |  |          f = open(filename, "w", encoding="UTF-8")
 | 
											
												
													
														|  | -        f2 = open(f"{os.getcwd()}\\cfg\\settings.json", encoding="UTF-8")
 |  | 
 | 
											
												
													
														|  | 
 |  | +        f2 = open(f"{self.projdir}/cfg/settings.json", encoding="UTF-8")
 | 
											
												
													
														|  |          f.write(f2.read())
 |  |          f.write(f2.read())
 | 
											
												
													
														|  |          f.close()
 |  |          f.close()
 | 
											
												
													
														|  |          f2.close()
 |  |          f2.close()
 |