Explorar el Código

Added tests and fixed test issues

Vsevolod Levitan hace 1 año
padre
commit
2321d09762

+ 4 - 3
src/logic/start_factory.py

@@ -132,7 +132,7 @@ class start_factory:
 
 
     def create_transactions(self):
     def create_transactions(self):
         units = [
         units = [
-            measurement_unit_model.create_g,
+            measurement_unit_model.create_g(),
             measurement_unit_model.create_kg(),
             measurement_unit_model.create_kg(),
             measurement_unit_model.create_l(),
             measurement_unit_model.create_l(),
             measurement_unit_model.create_ml(),
             measurement_unit_model.create_ml(),
@@ -141,8 +141,7 @@ class start_factory:
         nm = nomenclature_model(
         nm = nomenclature_model(
             "Test", "Test Test", units[0], nomenclature_group_model.create_group()
             "Test", "Test Test", units[0], nomenclature_group_model.create_group()
         )
         )
-        wh = warehouse_model("Test")
-        wh.address = "Teststest"
+        wh = warehouse_model("Test", "Testtest")
         res = []
         res = []
 
 
         for i in range(0, 20):
         for i in range(0, 20):
@@ -154,3 +153,5 @@ class start_factory:
             )
             )
 
 
         self.__save(storage.transaction_key(), res)
         self.__save(storage.transaction_key(), res)
+
+        return res

+ 1 - 1
src/models/measurement_unit_model.py

@@ -127,4 +127,4 @@ class measurement_unit_model(abstract_reference):
         Returns:
         Returns:
             Модель литра
             Модель литра
         """
         """
-        return measurement_unit_model("литр", measurement_unit_model.create_ml(), 1000)
+        return measurement_unit_model("литр", 1000, measurement_unit_model.create_ml())

+ 1 - 1
src/models/transaction_model.py

@@ -75,7 +75,7 @@ class transaction_model(abstract_reference):
     @TransactionType.setter
     @TransactionType.setter
     def TransactionType(self, value):
     def TransactionType(self, value):
         """Тип транзакции"""
         """Тип транзакции"""
-        self.__vtor.check_type(int)
+        self.__vtor.check_type(value, int)
         self.__transactionType = value
         self.__transactionType = value
 
 
     __measurementUnit = None
     __measurementUnit = None

+ 1 - 1
src/models/warehouse_model.py

@@ -20,6 +20,6 @@ class warehouse_model(abstract_reference):
     def Address(self, value):
     def Address(self, value):
         """Адрес склада"""
         """Адрес склада"""
         self.__vtor.check_type(value, str)
         self.__vtor.check_type(value, str)
-        self.__vtor.check_length_greater(str, 0)
+        self.__vtor.check_length_greater(value, 0)
 
 
         self.__address = value
         self.__address = value

+ 13 - 0
tests/test_factory.py

@@ -59,6 +59,19 @@ class test_factory(unittest.TestCase):
         assert len(stor.data[stor.ingredient_key()]) > 0
         assert len(stor.data[stor.ingredient_key()]) > 0
         assert len(stor.data[stor.recipe_key()]) > 0
         assert len(stor.data[stor.recipe_key()]) > 0
 
 
+    #
+    # Проверка создания и записи транзакций
+    #
+    def test_create_transactions(self):
+        stor = storage()
+        setman = settings_manager()
+        setman.open(f"{os.path.dirname(__file__) + '/..'}/config/settings.json")
+        st = setman.settings
+
+        result = start_factory(st, stor).create_transactions()
+
+        assert len(stor.data[stor.transaction_key()]) > 0
+
     #
     #
     # Проверка работы класса start_factory
     # Проверка работы класса start_factory
     #
     #