DataComparerLibrary 0.851__tar.gz → 0.854__tar.gz

{datacomparerlibrary-0.851 → datacomparerlibrary-0.854}/PKG-INFO

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

{datacomparerlibrary-0.851 → datacomparerlibrary-0.854}/src/DataComparerLibrary/field.py

@@ -66,30 +66,36 @@ class Field:
 
 
     def __match_data_with_template_keyword(self, other_field_data_including_templates):
-        match_status = MatchStatus.MISMATCH
+        match_status = MatchStatus.MATCH
         #
         match other_field_data_including_templates.upper():
             case "{PRESENT}":
-                if self.field_data:
-                    match_status = MatchStatus.MATCH
-                else:
+                if not self.field_data:
                     # No data is present in actual data field.
+                    match_status = MatchStatus.MISMATCH
                     Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "Actual data field is not PRESENT")
             #
             case "{EMPTY}":
-                if not self.field_data:
-                    match_status = MatchStatus.MATCH
-                else:
+                if self.field_data:
                     # Actual data field is not empty.
+                    match_status = MatchStatus.MISMATCH
                     Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "Actual data field is not EMPTY")
             #
             case "{INTEGER}":
                 if isinstance(self.field_data, int):
                     # A real integer (positive or negative).
                     match_status = MatchStatus.MATCH
+                #
+                elif self.field_data.isdigit():
+                    # Test on INTEGER temporary less tide again
+                    # Positive integer field in string format.
+                    match_status = MatchStatus.MATCH
+#                   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. Actual data is an INTEGER in string format while an INTEGER is expected.")
                 elif isinstance(self.field_data, str):
+                    match_status = MatchStatus.MISMATCH
                     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. Actual data is a string while an INTEGER is expected.")
                 else:
+                    match_status = MatchStatus.MISMATCH
                     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. Actual data field is not INTEGER.")
             #
             case "{SKIP}":
@@ -109,21 +115,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.

{datacomparerlibrary-0.851 → datacomparerlibrary-0.854}/src/DataComparerLibrary.egg-info/PKG-INFO

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