DataComparerLibrary 0.853__tar.gz → 0.855__tar.gz

{datacomparerlibrary-0.853 → datacomparerlibrary-0.855}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DataComparerLibrary
-Version: 0.853
+Version: 0.855
 Summary: For comparing csv-files, 2d-array with a csv-file or 2d-arrays. For comparing text-files, text variable with a text-file or text variables. Including a sorting module.
 Author-email: René Philip Zuijderduijn <datacomparerlibrary@outlook.com>
 License-Expression: Apache-2.0

{datacomparerlibrary-0.853 → datacomparerlibrary-0.855}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "DataComparerLibrary"
 description = "For comparing csv-files, 2d-array with a csv-file or 2d-arrays. For comparing text-files, text variable with a text-file or text variables. Including a sorting module."
-version = "0.853"
+version = "0.855"
 dependencies = ["python-dateutil"]
 authors = [{ name = "René Philip Zuijderduijn", email = "datacomparerlibrary@outlook.com" }]
 readme = "README.rst"

{datacomparerlibrary-0.853 → datacomparerlibrary-0.855}/src/DataComparerLibrary/datacomparer.py

@@ -87,6 +87,8 @@ class DataComparer:
 
     @staticmethod
     def compare_data(actual_data, expected_data, template_literals_dict=None):
+        if template_literals_dict is not None and not isinstance(template_literals_dict, dict):
+            raise Exception(f"The argument passed to parameter 'template_literals_dict' is not a dictionary. Value is: '{template_literals_dict}'.")
         actual_data = DataComparer.__make_data_2d_compliant(actual_data)
         expected_data = DataComparer.__make_data_2d_compliant(expected_data)
         #

{datacomparerlibrary-0.853 → datacomparerlibrary-0.855}/src/DataComparerLibrary/datetimehandler.py

@@ -9,15 +9,15 @@ class DatetimeHandler:
         position_open_brace_today_text  = expected_data_field_including_date_template.find("{NOW()")
         position_close_brace_today_text = expected_data_field_including_date_template.find("}", position_open_brace_today_text)
         #
+        if position_open_brace_today_text == -1:
+            raise Exception("Open brace '{NOW()' not found.")
+        #
         if position_close_brace_today_text == -1:
-            return -1
-        # Close brace of TODAY has been found.
+            raise Exception("Close brace '}' not found.")
         #
         expected_datetime_template_string = expected_data_field_including_date_template[position_open_brace_today_text:position_close_brace_today_text + 1]
         expected_datetime_string = DatetimeHandler.__convert_datetime_template_to_datetime(self, expected_datetime_template_string)
         #
-        if expected_datetime_string == -1:
-            return -1
         # Datetime_template_string has been converted to datetime.
         #
         # Replace expected_datetime_template_string by expected_datetime_string in expected_data_field_including_template.
@@ -48,18 +48,16 @@ class DatetimeHandler:
                     # Adjust date time based on current date time.
                     relative_datetime_template_string = template_datetime_string_splitted[0].replace('{NOW()', '')
                     relative_datetime = DatetimeHandler.__convert_relative_datetime_template_to_relative_datetime(self, relative_datetime_template_string[1:len(relative_datetime_template_string)])
-                    if relative_datetime == -1:
-                        return -1
-                    else:
-                        match relative_datetime_template_string[0]:
-                            case "+":
-                                expected_datetime = datetime.datetime.now() + relative_datetime
-                            case "-":
-                                expected_datetime = datetime.datetime.now() - relative_datetime
-                            case _:
-                                return -1
+                    #
+                    match relative_datetime_template_string[0]:
+                        case "+":
+                            expected_datetime = datetime.datetime.now() + relative_datetime
+                        case "-":
+                            expected_datetime = datetime.datetime.now() - relative_datetime
+                        case _:
+                            raise Exception("'+' or '-' sign not found in '{NOW() relative datetime template string'.")
             case _:
-                return -1
+                raise Exception("Datetime template format in {NOW() datetime string is incorrect. Split sign ':' to separate expectation and format has been found more than once.")
         #
         year = expected_datetime.strftime("%Y")
         year_2_digits = expected_datetime.strftime("%y")
@@ -80,7 +78,7 @@ class DatetimeHandler:
         period = regex.match(relative_datetime_str)
 
         if not period:
-            return -1
+            raise Exception("Relative datetime template format in '{NOW() datetime template string' " + relative_datetime_str + " is incorrect.")
 
         period = period.groupdict()
         kwargs = {}
@@ -97,4 +95,4 @@ class DatetimeHandler:
         if kwargs:
             return dateutil.relativedelta.relativedelta(**kwargs)
         else:
-            return -1    
+            raise Exception("Relative datetime template format in '{NOW() datetime template string' " + relative_datetime_str + " is incorrect.")

{datacomparerlibrary-0.853 → datacomparerlibrary-0.855}/src/DataComparerLibrary/field.py

@@ -49,9 +49,12 @@ class Field:
 
     @staticmethod
     def __replace_template_literals_dict(data, template_literals_dict):
-        if template_literals_dict:
-            for i in range(0, len(template_literals_dict)):
-                data = data.replace(list(template_literals_dict.keys())[i], str(list(template_literals_dict.values())[i]))
+        try:
+            if template_literals_dict:
+                for i in range(0, len(template_literals_dict)):
+                    data = data.replace(list(template_literals_dict.keys())[i], str(list(template_literals_dict.values())[i]))
+        except Exception as exception_message:
+            raise Exception(f"Error during replacing literals. The argument passed to parameter 'template_literals_dict': {template_literals_dict}. Error message: {exception_message}.")
         return data
 
 
@@ -115,21 +118,16 @@ class Field:
         skip_exception_rule_used = False
 
         if "{SKIP}" in other_field_data_including_templates.upper() or "{DATETIME_FORMAT():YYYYMMDDHHMMSSFF6}" in other_field_data_including_templates.upper():
-            if other_field_data_including_templates.upper() == "{SKIP}":
-                # Complete actual data field will be skipped for verification.
-                pass
-            else:
-                # Part(s) of the actual data field will be skipped for verification.
-                # Replace {SKIP}, ignoring cases, by wildcard *.
-                # compiled = re.compile(re.escape("{SKIP}"), re.IGNORECASE)
-                # expected_data_with_wildcard = compiled.sub("*", other_field_data_including_templates)
-                compiled = re.compile(re.escape("{SKIP}"), re.IGNORECASE)
-                compiled2 = re.compile(re.escape("{DATETIME_FORMAT():YYYYMMDDHHMMSSFF6}"), re.IGNORECASE)
-                expected_data_with_wildcard = compiled2.sub("*", compiled.sub("*", other_field_data_including_templates))
-                #
-                if fnmatch.fnmatch(self.field_data, expected_data_with_wildcard):
-                    skip_exception_rule_used = True
-                    # continue
+            # Part(s) of the actual data field will be skipped for verification.
+            # Replace {SKIP}, ignoring cases, by wildcard *.
+            # compiled = re.compile(re.escape("{SKIP}"), re.IGNORECASE)
+            # expected_data_with_wildcard = compiled.sub("*", other_field_data_including_templates)
+            compiled = re.compile(re.escape("{SKIP}"), re.IGNORECASE)
+            compiled2 = re.compile(re.escape("{DATETIME_FORMAT():YYYYMMDDHHMMSSFF6}"), re.IGNORECASE)
+            expected_data_with_wildcard = compiled2.sub("*", compiled.sub("*", other_field_data_including_templates))
+            #
+            if fnmatch.fnmatch(self.field_data, expected_data_with_wildcard):
+                skip_exception_rule_used = True
         #
         if expected_data_with_wildcard == None:
             # Wildcards not used.
@@ -142,20 +140,23 @@ class Field:
             if all([x not in other_field_data_including_templates.upper() for x in matches]):
                 equal = False
                 Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "NOW() has been found in expected data field, but format is incorrect.")
-                #continue
-            #
-            expected_data = DatetimeHandler.replace_date_template_in_expected_data(self, expected_data_including_date_template)
+                Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "Colon character ':', sign '+' or '-'' is missing behind NOW().")
+                return False
             #
-            if expected_data == -1:
-                equal = False
-                Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "NOW() has been found in expected data field, but format is incorrect.")
-            else:
+            try:
+                expected_data = DatetimeHandler.replace_date_template_in_expected_data(self, expected_data_including_date_template)
+                #
                 if not fnmatch.fnmatch(self.field_data, expected_data):
                     # No match despite using of wildcard(s).
                     equal = False
                     Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "Date template format displayed. See also next message line.")
                     Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, expected_data, "There is a difference between actual and expected data.")
-            # continue
+                #
+            except Exception as exception_message:
+                equal = False
+                Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "NOW() has been found in expected data field, but format is incorrect.")
+                Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, exception_message)
+
             #
         elif "{NOT(" in other_field_data_including_templates.upper():
             try:
@@ -165,11 +166,11 @@ class Field:
                     # Unwanted match.
                     equal = False
                     Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "NOT() template format displayed. See also next message line.")
-                    Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, unwanted_expected_data, "Actual and expected data are equal. However actual data should NOT be equal to the expected data!!!")
+                    Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, "<> "+ str(unwanted_expected_data), "Actual and expected data are equal. However actual data should NOT be equal to the expected data!!!")
             except Exception as exception_message:
-                # print(f"An exception occurred: {exception_message}")
                 equal = False
                 Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "NOT() has been found in expected data field, but format is incorrect.")
+                Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, exception_message)
             #
         else:
             if not skip_exception_rule_used:
@@ -187,11 +188,11 @@ class Field:
         #
         if position_open_brace == -1:
             #print("position_open_brace:", position_open_brace)
-            raise Exception()
+            raise Exception("Open brace '{NOT(' not found.")
         #
         if position_close_brace == -1:
             #print("position_close_brace:", position_close_brace)
-            raise Exception()
+            raise Exception("Close brace '}' not found.")
         #
         unwanted_expected_data = expected_data_field_including_date_template[position_open_brace+5:position_close_brace]
         #

{datacomparerlibrary-0.853 → datacomparerlibrary-0.855}/src/DataComparerLibrary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DataComparerLibrary
-Version: 0.853
+Version: 0.855
 Summary: For comparing csv-files, 2d-array with a csv-file or 2d-arrays. For comparing text-files, text variable with a text-file or text variables. Including a sorting module.
 Author-email: René Philip Zuijderduijn <datacomparerlibrary@outlook.com>
 License-Expression: Apache-2.0