holado 0.2.7__py3-none-any.whl → 0.3.0__py3-none-any.whl

holado_test/tests/behave/steps/scenario/tester_steps.py

@@ -15,7 +15,7 @@
 
 from holado_test.scenario.step_tools import StepTools
 from holado.common.context.session_context import SessionContext
-from holado_test.behave.behave import *
+from holado_test.behave.behave import *  # @UnusedWildImport
 import logging
 from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
 from holado_core.common.exceptions.functional_exception import FunctionalException
@@ -31,8 +31,8 @@ def __get_variable_manager():
     return __get_scenario_context().get_variable_manager()
 
 
-@Step(r"tester logs (?P<msg>{AnyStr})")
-def step_impl(context, msg):
+@Step(r"tester logs (?P<msg>{AnyStr})(?: \((?P<unlimited_str>unlimited)\))?")
+def step_impl(context, msg, unlimited_str):
     msg = StepTools.evaluate_scenario_parameter(msg)
     
     # Add multiline text if present
@@ -45,7 +45,7 @@ def step_impl(context, msg):
     if table:
         msg += '\n' + table.represent(4)
     
-    TesterTools.log(msg)
+    TesterTools.log(msg, unlimited_str is not None)
     
     
 @Step(r"(?P<var_name>{Variable}) = tester represents (?P<param>{Any})")

holado_value/common/tables/converters/value_table_converter.py

@@ -27,6 +27,7 @@ from holado_value.common.tools.value_types import ValueTypes
 from holado_core.common.tools.tools import Tools
 from holado_json.ipc.json_converter import JsonConverter
 from holado_python.standard_library.typing import Typing
+from holado_data.data.generator.base import BaseGenerator
 
 logger = logging.getLogger(__name__)
 
@@ -67,15 +68,58 @@ class ValueTableConverter(TableConverter):
         return res
         
     @classmethod
-    def convert_table_with_header_to_dict_list(cls, table):
-        index_by_name = table.get_column_indexes_by_string_content()
-
-        res = []
-        for row in table.rows:
-            new_dict = {name: row.get_cell(index).value for name, index in index_by_name.items()}
-            res.append(new_dict)
+    def convert_table_with_header_to_dict_list(cls, table, as_generator=False):
+        if not ValueTableManager.is_value_table(table):
+            return TableConverter.convert_table_with_header_to_dict_list(table, as_generator=as_generator)
+        
+        if as_generator:
+            class TableWithHeader2DictGenerator(BaseGenerator):
+                def __init__(self, table):
+                    super().__init__(name="table with header to dict generator")
+                    self.__table = table
+                    self.__index_by_name = table.get_column_indexes_by_string_content()
+                    self.__table_rows_iter = iter(self.__table.rows)
+                
+                def __next__(self):
+                    row = next(self.__table_rows_iter)
+                    return {name: row.get_cell(index).value for name, index in self.__index_by_name.items()}
             
-        return res
+            return TableWithHeader2DictGenerator(table)
+        else:
+            # index_by_name = table.get_column_indexes_by_string_content()
+            #
+            # res = []
+            # for row in table.rows:
+            #     new_dict = {name: row.get_cell(index).value for name, index in index_by_name.items()}
+            #     res.append(new_dict)
+            #
+            # return res
+            gen = cls.convert_table_with_header_to_dict_list(table, as_generator=True)
+            return [e for e in gen]
+    
+    @classmethod
+    def convert_table_2_list_of_tuples(cls, table, as_generator=False):
+        if not ValueTableManager.is_value_table(table):
+            return TableConverter.convert_table_2_list_of_tuples(table, as_generator=as_generator)
+        
+        if Tools.do_log(logger, logging.DEBUG):
+            logger.debug("Converting table to a list of tuples...")
+        if as_generator:
+            class Table2TupleGenerator(BaseGenerator):
+                def __init__(self, table):
+                    super().__init__(name="table with header to dict generator")
+                    self.__table = table
+                    self.__table_rows_iter = iter(self.__table.rows)
+                
+                def __next__(self):
+                    row = next(self.__table_rows_iter)
+                    return tuple((cell.value for cell in row.cells))
+            
+            return Table2TupleGenerator(table)
+        else:
+            # return [tuple((cell.content for cell in row.cells)) for row in table.rows]
+            gen = cls.convert_table_2_list_of_tuples(table, as_generator=True)
+            return [e for e in gen]
     
     @classmethod
     def convert_name_value_table_2_dict(cls, table, with_original_value_content = False):

holado_value/common/tables/value_table_cell.py

@@ -63,6 +63,11 @@ class ValueTableCell(TableCell):
     def value(self):
         return self.__value.value
     
+    @value.setter
+    def value(self, value):
+        self.__value = Value(original_value=None, value=value, do_eval_once=self.__value.do_eval_once)
+        self.content = self.__value.original_value
+    
     def get_value(self, raise_if_undefined=False):
         return self.__value.get_value(raise_if_undefined=raise_if_undefined)
     

holado_value/common/tables/value_table_manager.py

@@ -35,16 +35,6 @@ class ValueTableManager(TableManager):
             raise VerifyException(f"Table is not a ValueTable of ValueTableWithHeader (table type: {type(table)})")
         return res
     
-    @classmethod
-    def convert_table_2_list_of_tuples(cls, table):
-        if isinstance(table, ValueTable) or isinstance(table, ValueTableWithHeader):
-            if Tools.do_log(logger, logging.DEBUG):
-                logger.debug("Converting value table to a list of tuples...")
-            return [tuple((cell.value for cell in row.cells)) for row in table.rows]
-        else:
-            return TableManager.convert_table_2_list_of_tuples(table)
-    
-    
     @classmethod
     def set_object_attributes_according_name_value_table(cls, obj, table):
         if not cls.is_value_table(table):

holado_value/common/tables/value_table_row.py

@@ -16,7 +16,6 @@ from holado_value.common.tables.value_table_cell import ValueTableCell
 from holado_core.common.tables.table_row import TableRow
 import logging
 from holado_core.common.tools.tools import Tools
-from holado_python.standard_library.typing import Typing
 from holado.common.handlers.undefined import undefined_value
 
 logger = logging.getLogger(__name__)

holado_value/common/tools/value.py

@@ -69,7 +69,11 @@ class Value(object):
             return (self.get_value() < other.get_value())
         else:
             return TechnicalException(f"Unmanaged comparison between types '{self.__class__.__name__}' and '{other.__class__.__name__}'")
-
+    
+    @property
+    def do_eval_once(self):
+        return self.__do_eval_once
+    
     @property
     def string_value(self):
         value = self.get_value()

holado_ws/tests/behave/steps/api/web_service_steps.py

@@ -22,7 +22,7 @@ from holado_value.common.tables.value_table_manager import ValueTableManager
 from holado.common.context.session_context import SessionContext
 from holado_core.common.exceptions.functional_exception import FunctionalException
 from holado_core.common.exceptions.technical_exception import TechnicalException
-from holado_test.behave.behave import *
+from holado_test.behave.behave import *  # @UnusedWildImport
 from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
 from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
 from holado_test.scenario.step_tools import StepTools

holado_yaml/tests/behave/steps/yaml_steps.py

@@ -15,7 +15,7 @@
 
 from holado_test.scenario.step_tools import StepTools
 from holado.common.context.session_context import SessionContext
-from holado_test.behave.behave import *
+from holado_test.behave.behave import *  # @UnusedWildImport
 import logging
 from holado_yaml.yaml.yaml_manager import YAMLManager
 

holado_yaml/yaml/yaml_manager.py

@@ -39,7 +39,7 @@ class YAMLManager(object):
         return with_yaml
     
     @classmethod
-    def __path_manager(cls):
+    def __get_path_manager(cls):
         return SessionContext.instance().path_manager
     
     @classmethod
@@ -78,7 +78,7 @@ class YAMLManager(object):
     
     @classmethod
     def save_file(cls, data, file_path):
-        cls.__path_manager().makedirs(file_path)
+        cls.__get_path_manager().makedirs(file_path)
         with open(file_path, 'w') as file:
             yaml.dump(data, file)
 

test_holado/features/NonReg/common/tables/table.feature

@@ -10,37 +10,37 @@ Feature: Features related to tables
         
         Given end preconditions
         ### PRECONDITIONS - END
-    	
-		    Then table INPUT_TABLE is
+        
+        Then table INPUT_TABLE is
             | Name    | Value   |
             | 'test1' | 1       |
             | 'test2' | 2.0     |
             | 'test3' | 'test3' |
             | 'test4' | None    |
             
-       	Given EXTRACTED = extract column 'Name' from table INPUT_TABLE
-       	Then table EXTRACTED is
-         		| Name    |
-         		| 'test1' |
-         		| 'test2' |
-         		| 'test3' |
-       	  	| 'test4' |
+        Given EXTRACTED = extract column 'Name' from table INPUT_TABLE
+        Then table EXTRACTED is
+            | Name    |
+            | 'test1' |
+            | 'test2' |
+            | 'test3' |
+            | 'test4' |
             
-       	Given EXTRACTED = extract column 'Value' cells from table INPUT_TABLE
-       	Then table EXTRACTED is
-         		| 1       |
-         		| 2.0     |
-       	  	| 'test3' |
+        Given EXTRACTED = extract column 'Value' cells from table INPUT_TABLE
+        Then table EXTRACTED is
+            | 1       |
+            | 2.0     |
+            | 'test3' |
             | None    |
             
-       	Given EXTRACTED = extract column 'Value' cells from table INPUT_TABLE as row
-       	Then table EXTRACTED is
-       	    | 1       | 2.0     | 'test3' | None    |
+        Given EXTRACTED = extract column 'Value' cells from table INPUT_TABLE as row
+        Then table EXTRACTED is
+            | 1       | 2.0     | 'test3' | None    |
 
     Scenario: Empty table
         ### PRECONDITIONS - BEGIN
         Given begin preconditions
-  		
+      
         Given INPUT_TABLE = convert json '{}' to name/value table with names uncollapsed
         Then table INPUT_TABLE is
             | Name | Value |
@@ -53,7 +53,7 @@ Feature: Features related to tables
     Scenario: Table count
         ### PRECONDITIONS - BEGIN
         Given begin preconditions
-  		
+      
         Given INPUT_TABLE = convert json '{"test1" : 1, "test2":2.0, "test3": "test3", "test4" : null}' to name/value table with names uncollapsed
         
         Then table INPUT_TABLE is
@@ -67,7 +67,7 @@ Feature: Features related to tables
         ### PRECONDITIONS - END
         
         Given TABLE_COUNT = number of rows in table INPUT_TABLE
-    		Then TABLE_COUNT == 4
+        Then TABLE_COUNT == 4
     
 
     Scenario: Table count empty
@@ -82,12 +82,13 @@ Feature: Features related to tables
         Given TABLE_COUNT = number of rows in table INPUT_TABLE
         Then TABLE_COUNT == 0
 
-
+    @table_is
     Scenario: Table verification and variables
         ### PRECONDITIONS - BEGIN
         Given begin preconditions
-
-        Given INPUT_TABLE = convert json '{"test1" : 1, "test2":2.0, "test3": "TEST3 value", "test4" : null}' to name/value table with names uncollapsed
+        
+        Given TABLE_1 = convert json '{"test1" : 1, "test2":2.0, "test3": "TEST3 value", "test4" : null}' to name/value table with names uncollapsed
+        Given TABLE_2 = convert json '{"TEST1" : 1, "TEST2":2.0, "TEST3": "TEST3 value", "TEST4" : null}' to table with names as columns
         
         Given TEST3 = 'test3'
         Given TEST3_VALUE = 'TEST3 value'
@@ -95,13 +96,18 @@ Feature: Features related to tables
         Given end preconditions
         ### PRECONDITIONS - END
         
-        Then table INPUT_TABLE is
+        Then table TABLE_1 is
             | Name    | Value   |
             | 'test1' | 1       |
             | 'test2' | 2.0     |
             | ${TEST3} | ${TEST3_VALUE} |
             | 'test4' | None    |
 
+        Then table TABLE_2 is
+            | TEST1 | TEST2 | TEST3          | TEST4 |
+            | 1     | 2.0   | ${TEST3_VALUE} | None  |
+
+
     @table_without_rows
     Scenario: Table without rows
         ### PRECONDITIONS - BEGIN

test_holado/features/NonReg/holado_ais/ais_message-bitarray_to_nmea.feature

@@ -52,7 +52,7 @@ Feature: Test decode of AIS message from bitarry and its encode in NMEAv4
     Scenario Outline: from NMEAv4 sentences to bitarray through decode
 
         Given NMEA_SENTENCES = split text <msg_nmea> on separator '\n'
-        When MSG = decode AIS NMEA message NMEA_SENTENCES
+        When MSG = decode NMEA AIS message NMEA_SENTENCES
         Then MSG.mmsi == <mmsi>
         
         When MSG_RAW = convert AIS message MSG to hexadecimal string

test_holado/features/NonReg/holado_python/standard_library/socket/local_echo_server/socket_reset.feature

@@ -0,0 +1,191 @@
+@testing_solution
+@python
+@socket
+Feature: Test python socket reset steps
+
+    @blocking_socket
+    @reset_data
+    Scenario: Reset received data (client with blocking connections)
+
+        ### PRECONDITIONS - BEGIN
+        Given begin preconditions
+        
+        Given PORT = first available anonymous port
+        Given SERVER = new echo TCP socket server
+            | Name   | Value       |
+            | 'host' | '127.0.0.1' |
+            | 'port' | PORT        |
+        
+        Given CLIENT = new TCP socket client
+            | Name       | Value       |
+            | 'host'     | '127.0.0.1' |
+            | 'port'     | PORT        |
+        
+        Given end preconditions
+        ### PRECONDITIONS - END
+        
+        # Start server & client
+        When start (socket server: SERVER)
+        When start (socket client: CLIENT)
+        
+        # Write data and verify received data size
+        When write b'\x01\x02' (socket: CLIENT)
+        
+        When await socket CLIENT receives data
+        When SIZE = size of received data (socket: CLIENT)
+        Then SIZE > 0
+        
+        # Reset data and verify
+        Given reset stored received data in socket CLIENT
+        When SIZE = size of received data (socket: CLIENT)
+        Then SIZE == 0
+        
+        # Stop server & client
+        #When stop (socket server: SERVER)
+        When stop (socket client: CLIENT)
+
+
+
+    @non_blocking_socket
+    @reset_data
+    Scenario: Reset received data (client with non blocking connections)
+
+        ### PRECONDITIONS - BEGIN
+        Given begin preconditions
+        
+        Given PORT = first available anonymous port
+        Given SERVER = new echo TCP socket server
+            | Name   | Value       |
+            | 'host' | '127.0.0.1' |
+            | 'port' | PORT        |
+        
+        Given CLIENT = new TCP socket client
+            | Name       | Value       |
+            | 'host'     | '127.0.0.1' |
+            | 'port'     | PORT        |
+            | 'blocking' | False       |
+        
+        Given end preconditions
+        ### PRECONDITIONS - END
+        
+        # Start server & client
+        When start (socket server: SERVER)
+        When start (socket client: CLIENT)
+        
+        # Write data and verify received data size
+        When write b'\x01\x02' (socket: CLIENT)
+        
+        When await socket CLIENT receives data
+        When SIZE = size of received data (socket: CLIENT)
+        Then SIZE > 0
+        
+        # Reset data and verify
+        Given reset stored received data in socket CLIENT
+        When SIZE = size of received data (socket: CLIENT)
+        Then SIZE == 0
+        
+        # Stop server & client
+        #When stop (socket server: SERVER)
+        When stop (socket client: CLIENT)
+
+
+
+    @message_socket
+    @blocking_socket
+    @reset_messages
+    Scenario: Reset received messages (client with blocking connections)
+
+        ### PRECONDITIONS - BEGIN
+        Given begin preconditions
+        
+        # Use echo server with a blocking connection
+        Given PORT = first available anonymous port
+        Given SERVER = new echo TCP socket server
+            | Name   | Value       |
+            | 'host' | '127.0.0.1' |
+            | 'port' | PORT        |
+        
+        # Create a message client
+        Given CLIENT = new message TCP socket client
+            | Name        | Value       |
+            | 'host'      | '127.0.0.1' |
+            | 'port'      | PORT        |
+            | 'separator' | b'\n'       |
+        
+        Given end preconditions
+        ### PRECONDITIONS - END
+        
+        # Start echo server & message client
+        When start (socket server: SERVER)
+        When start (socket client: CLIENT)
+        
+        # Write data and verify result is identical
+        When write message b'\x01\x02' (socket: CLIENT)
+        When write message b'\x11\x21' (socket: CLIENT)
+        
+        # Verify number of received messages
+        When await socket CLIENT receives messages (window: 0.1 s)
+        When NB_MSG = number of received messages (socket: CLIENT)
+        Then NB_MSG == 2
+        
+        # Reset data and verify
+        Given reset stored received messages in socket CLIENT
+        When NB_MSG = number of received messages (socket: CLIENT)
+        Then NB_MSG == 0
+        
+        # Stop server & client
+        #When stop (socket server: SERVER)
+        When stop (socket client: CLIENT)
+
+
+
+    @message_socket
+    @non_blocking_socket
+    @reset_messages
+    Scenario: Reset received messages (client with non blocking connections)
+
+        ### PRECONDITIONS - BEGIN
+        Given begin preconditions
+        
+        # Use echo server with a blocking connection
+        Given PORT = first available anonymous port
+        Given SERVER = new echo TCP socket server
+            | Name   | Value       |
+            | 'host' | '127.0.0.1' |
+            | 'port' | PORT        |
+        
+        # Create a message client
+        Given CLIENT = new message TCP socket client
+            | Name        | Value       |
+            | 'host'      | '127.0.0.1' |
+            | 'port'      | PORT        |
+            | 'separator' | b'\n'       |
+            | 'blocking'  | False       |
+        
+        Given end preconditions
+        ### PRECONDITIONS - END
+        
+        # Start echo server & message client
+        When start (socket server: SERVER)
+        When start (socket client: CLIENT)
+        
+        # Write data and verify result is identical
+        When write message b'\x01\x02' (socket: CLIENT)
+        When write message b'\x11\x21' (socket: CLIENT)
+        
+        # Verify number of received messages
+        When await socket CLIENT receives messages (window: 0.1 s)
+        When NB_MSG = number of received messages (socket: CLIENT)
+        Then NB_MSG == 2
+        
+        # Reset data and verify
+        Given reset stored received messages in socket CLIENT
+        When NB_MSG = number of received messages (socket: CLIENT)
+        Then NB_MSG == 0
+        
+        # Stop server & client
+        #When stop (socket server: SERVER)
+        When stop (socket client: CLIENT)
+
+
+