DataComparerLibrary 0.857__tar.gz → 0.858__tar.gz

{datacomparerlibrary-0.857 → datacomparerlibrary-0.858}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DataComparerLibrary
-Version: 0.857
+Version: 0.858
 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.857 → datacomparerlibrary-0.858}/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.857"
+version = "0.858"
 dependencies = ["python-dateutil"]
 authors = [{ name = "René Philip Zuijderduijn", email = "datacomparerlibrary@outlook.com" }]
 readme = "README.rst"

{datacomparerlibrary-0.857 → datacomparerlibrary-0.858}/src/DataComparerLibrary/field.py

@@ -112,55 +112,22 @@ class Field:
 
     def __match_data_with_template(self, other_field_data_including_templates):
         equal = True
-
-        expected_data_including_date_template = None
-        expected_data_with_wildcard = None
-        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():
-            # 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.
-            expected_data_including_date_template = other_field_data_including_templates
-        else:
-            expected_data_including_date_template = expected_data_with_wildcard
+        expected_data_with_skips_replaced = None
+        expected_data_with_skips_replaced = Field.__replace_skips(other_field_data_including_templates)
         #
         if "{NOW()" in other_field_data_including_templates.upper():
-            matches = ["{NOW():", "{NOW()+", "{NOW()-"]
-            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.")
-                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
+            expected_data_with_nows_replaced = Field.__replace_now(self, expected_data_with_skips_replaced, other_field_data_including_templates)
             #
-            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.")
-                #
-            except Exception as exception_message:
+            if not fnmatch.fnmatch(self.field_data, expected_data_with_nows_replaced):
+                # 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, "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)
-
+                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_with_nows_replaced, "There is a difference between actual and expected data.")
             #
         elif "{NOT(" in other_field_data_including_templates.upper():
             try:
-                unwanted_expected_data = Field.__get_unwanted_expected_data(expected_data_including_date_template)
+                unwanted_expected_data = Field.__get_unwanted_expected_data(expected_data_with_skips_replaced)
                 #
                 if self.field_data == unwanted_expected_data:
                     # Unwanted match.
@@ -173,7 +140,7 @@ class Field:
                 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:
+            if expected_data_with_skips_replaced == other_field_data_including_templates:
                 # No exceptions.
                 equal = False
                 Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "There is a difference between actual and expected data. No exception rule has been used.")
@@ -181,6 +148,44 @@ class Field:
         return equal
 
 
+    @staticmethod
+    def __replace_skips(field_data):
+        field_data_with_skips_replaced_by_wildcard = None
+        #
+        if "{SKIP}" in field_data.upper() or "{DATETIME_FORMAT():YYYYMMDDHHMMSSFF6}" in field_data.upper():
+            # 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)
+            # field_data_with_wildcard = compiled.sub("*", field_data)
+            compiled = re.compile(re.escape("{SKIP}"), re.IGNORECASE)
+            compiled2 = re.compile(re.escape("{DATETIME_FORMAT():YYYYMMDDHHMMSSFF6}"), re.IGNORECASE)
+            field_data_with_skips_replaced_by_wildcard = compiled2.sub("*", compiled.sub("*", field_data))
+        #
+        if field_data_with_skips_replaced_by_wildcard == None:
+            # No {SKIP}'s found.
+            field_data_with_skips_replaced_by_wildcard = field_data
+        return field_data_with_skips_replaced_by_wildcard
+
+
+    def __replace_now(self, converted_expected_field_data, original_expected_field_data):
+        while "{NOW()" in converted_expected_field_data.upper():
+            matches = ["{NOW():", "{NOW()+", "{NOW()-"]
+            if all([x not in converted_expected_field_data.upper() for x in matches]):
+                Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, original_expected_field_data, "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, original_expected_field_data, "Colon character ':', sign '+' or '-'' is missing behind NOW().")
+                break
+            #
+            try:
+                converted_expected_field_data = DatetimeHandler.replace_date_template_in_expected_data(self, converted_expected_field_data)
+                #
+            except Exception as exception_message:
+                Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, original_expected_field_data, "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, original_expected_field_data, exception_message)
+                break
+            #
+        return converted_expected_field_data
+
+
     @staticmethod
     def __get_unwanted_expected_data(expected_data_field_including_date_template):
         position_open_brace = expected_data_field_including_date_template.find("{NOT(")
@@ -199,5 +204,3 @@ class Field:
         if Tools.is_integer(unwanted_expected_data):
             unwanted_expected_data = int(unwanted_expected_data)
         return unwanted_expected_data
-
-

{datacomparerlibrary-0.857 → datacomparerlibrary-0.858}/src/DataComparerLibrary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DataComparerLibrary
-Version: 0.857
+Version: 0.858
 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