DataComparerLibrary 0.833__tar.gz → 0.835__tar.gz

{DataComparerLibrary-0.833 → DataComparerLibrary-0.835}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DataComparerLibrary
-Version: 0.833
+Version: 0.835
 Summary: For comparing csv-files or 2d-array with csv-file.
 Home-page: 
 Author: René Philip Zuijderduijn

{DataComparerLibrary-0.833 → DataComparerLibrary-0.835}/src/DataComparerLibrary/datacomparer.py

@@ -136,10 +136,16 @@ class DataComparer:
                     continue
                 #
                 if actual_data[row_nr][column_nr] != expected_data_including_templates[row_nr][column_nr]:
-                    if isinstance(expected_data_including_templates[row_nr][column_nr], int):
-                        difference_found = True
-                        DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "There is a difference between actual and expected data. No exception rule has been used.")
+                    # Verify if difference is a matter of string versus integer representation.
+                    if str(actual_data[row_nr][column_nr]) == str(expected_data_including_templates[row_nr][column_nr]):
+                        if isinstance(actual_data[row_nr][column_nr], int) and isinstance(expected_data_including_templates[row_nr][column_nr], str):
+                            difference_found = True
+                            DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "There is a difference between actual and expected data. Actual data is an integer while expected data is a string.")
+                        elif isinstance(actual_data[row_nr][column_nr], str) and isinstance(expected_data_including_templates[row_nr][column_nr], int):
+                            difference_found = True
+                            DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "There is a difference between actual and expected data. Actual data is a string while expected data is an integer.")
                         continue
+                    #
                     # If data in actual and expected field doesn't match, check if a template has been used in expected data.
                     match expected_data_including_templates[row_nr][column_nr].upper():
                         case "{PRESENT}":
@@ -183,11 +189,13 @@ class DataComparer:
                                     #
                                     if fnmatch.fnmatch(actual_data[row_nr][column_nr], expected_data_with_wildcard):
                                         skip_exception_rule_used = True
-                                    else:
-                                        # No match despite using of wildcard(s).
-                                        if "{NOW()" not in expected_data_including_templates[row_nr][column_nr].upper():
-                                            difference_found = True
-                                            DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "Actual data field has not been SKIPped.")
+                                        continue
+                                    # This can probably be removed. It is verified further in the code
+#                                    else:
+#                                        # No match despite using of wildcard(s).
+#                                        if "{NOW()" not in expected_data_including_templates[row_nr][column_nr].upper():
+#                                            difference_found = True
+#                                            DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "Actual data field has not been SKIPped.")
                             #
                             if expected_data_with_wildcard is None:
                                 # Wildcards not used.
@@ -196,7 +204,7 @@ class DataComparer:
                                 expected_data_including_date_template = expected_data_with_wildcard
                             #
                             if "{NOW()" in expected_data_including_templates[row_nr][column_nr].upper():
-                                matches = ["NOW():", "NOW()+", "{NOW()-"]
+                                matches = ["{NOW():", "{NOW()+", "{NOW()-"]
                                 if all([x not in expected_data_including_templates[row_nr][column_nr].upper() for x in matches]):
                                     difference_found = True
                                     DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "NOW() has been found in expected data field, but format is incorrect.")
@@ -213,6 +221,20 @@ class DataComparer:
                                         difference_found = True
                                         DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "Date template format displayed. See also next message line.")
                                         DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data, "There is a difference between actual and expected data.")
+                                        continue
+                                #
+                            if "{NOT(" in expected_data_including_templates[row_nr][column_nr].upper():
+                                unwanted_expected_data = DataComparer.__get_unwanted_expected_data(self, expected_data_including_date_template)
+                                #
+                                if unwanted_expected_data == -1:
+                                    difference_found = True
+                                    DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "NOT() has been found in expected data field, but format is incorrect.")
+                                else:
+                                    if fnmatch.fnmatch(actual_data[row_nr][column_nr], unwanted_expected_data):
+                                        # Unwanted match.
+                                        difference_found = True
+                                        DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "NOT() template format displayed. See also next message line.")
+                                        DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], unwanted_expected_data, "Actual and expected data are equal. However actual data should NOT be equal to the expected data!!!")
                                 #
                             else:
                                 if not skip_exception_rule_used:
@@ -348,4 +370,18 @@ class DataComparer:
         print("Row: ", row_number + 1, "  Column: ", column_number + 1, "  =>  Actual data: ", actual_data, "    Expected data: ", expected_data, "    Remark / Error message: ", error_message)
 
 
+    def __get_unwanted_expected_data(self, expected_data_field_including_date_template):
+        position_open_brace_not_text = expected_data_field_including_date_template.find("{NOT(")
+        position_close_brace_not_text = expected_data_field_including_date_template.find(")}", position_open_brace_not_text)
+        #
+        if position_open_brace_not_text == -1:
+            #print("position_open_brace_not_text:", position_open_brace_not_text)
+            return -1
+        #
+        if position_close_brace_not_text == -1:
+            #print("position_close_brace_not_text:", position_close_brace_not_text)
+            return -1
+        #
+        unwanted_expected_data = expected_data_field_including_date_template[position_open_brace_not_text+5:position_close_brace_not_text]
+        return unwanted_expected_data
 

{DataComparerLibrary-0.833 → DataComparerLibrary-0.835}/src/DataComparerLibrary/datasorter.py

@@ -6,7 +6,7 @@ from DataComparerLibrary.delimitertranslator import DelimiterTranslator
 
 
 class DataSorter:
-    def sort_file(self, input_file, output_file, number_of_header_lines=0, number_of_trailer_lines=0, sort_on_columns_list=None, delimiter=',', quotechar=None):
+    def sort_csv_file(self, input_file, output_file, number_of_header_lines=0, number_of_trailer_lines=0, sort_on_columns_list=None, delimiter=',', quotechar=None):
         try:
             if not os.path.isfile(input_file):
                 raise Exception("Input file doesn't exists: ", input_file)

{DataComparerLibrary-0.833 → DataComparerLibrary-0.835}/src/DataComparerLibrary/version.py

@@ -1,3 +1,3 @@
 # encoding=utf-8
 
-VERSION = '0.833'
+VERSION = '0.835'

{DataComparerLibrary-0.833 → DataComparerLibrary-0.835}/src/DataComparerLibrary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DataComparerLibrary
-Version: 0.833
+Version: 0.835
 Summary: For comparing csv-files or 2d-array with csv-file.
 Home-page: 
 Author: René Philip Zuijderduijn