Ver Fonte

Refactoring and file rearrangement

Vsevolod Levitan há 1 ano atrás
pai
commit
a92c340c6d

+ 0 - 0
src/abstract-reference.py → src/errors/abstract_reference.py


+ 1 - 1
src/argument-exception.py → src/errors/argument_exception.py

@@ -1,4 +1,4 @@
-from error_proxy import error_proxy
+from src.errors.error_proxy import error_proxy
 
 
 class argument_exception(Exception):

+ 0 - 0
src/error-proxy.py → src/errors/error_proxy.py


+ 1 - 1
src/settings.py → src/settings/settings.py

@@ -1,4 +1,4 @@
-from src.validator import validator
+from src.validation.validator import validator
 
 
 class settings:

+ 0 - 0
src/settings_manager.py → src/settings/settings_manager.py


+ 0 - 0
src/validator.py → src/validation/validator.py


+ 5 - 5
src/test-errors.py → tests/test_errors.py

@@ -1,6 +1,6 @@
-from error_proxy import error_proxy
+from src.errors.error_proxy import error_proxy
 import unittest
-from argument_exception import argument_exception
+from src.errors.argument_exception import argument_exception
 
 
 
@@ -21,7 +21,7 @@ class test_errors(unittest.TestCase):
             assert ex.error.is_error
             return
             
-        assert 1 != 1    
+        assert False  
         
     
     def test_check_set_exception(self):
@@ -36,7 +36,7 @@ class test_errors(unittest.TestCase):
             error.set_error(ex)
             
         # Проверки
-        assert error.is_error == True
+        assert error.is_error
         
     
     def test_check_set_error_text(self):
@@ -46,4 +46,4 @@ class test_errors(unittest.TestCase):
         # Действие
         
         # Проверки
-        assert error.is_error == True
+        assert error.is_error

+ 3 - 3
tests/test_settings.py

@@ -1,6 +1,6 @@
-from src.settings import settings
-from src.settings_manager import settings_manager
-from src.validator import validator as settings_validator
+from src.settings.settings import settings
+from src.settings.settings_manager import settings_manager
+from src.validation.validator import validator as settings_validator
 import unittest, os, random