DataComparerLibrary 0.843__tar.gz → 0.844__tar.gz

{datacomparerlibrary-0.843/src/DataComparerLibrary.egg-info → datacomparerlibrary-0.844}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: DataComparerLibrary
-Version: 0.843
-Summary: For comparing csv-files or 2d-array with csv-file.
+Version: 0.844
+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.
 Home-page: 
 Author: René Philip Zuijderduijn
 Author-email: datacomparerlibrary@outlook.com
@@ -15,6 +15,8 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 
@@ -106,8 +108,12 @@ The DataComparerLibrary can be used for:
   quotechar.
 
 
+Comparing Data
+--------------
+
+
 Examples of using the DataComparerLibrary for comparing data in Python
-----------------------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there are some examples how to call the methods of the DataComparerLibrary in Python::
 
@@ -122,7 +128,7 @@ Below there are some examples how to call the methods of the DataComparerLibrary
 
 
 Examples of using the DataComparerLibrary keywords for comparing data in Robot Framework
-----------------------------------------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there are some examples how to call the keywords of the DataComparerLibrary in Robot Framework::
 
@@ -146,7 +152,7 @@ Below there are some examples how to call the keywords of the DataComparerLibrar
 
 
 Examples comparing Actual Data with Expected Data
--------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there is an example of actual and expected data with some different cases.
 
@@ -185,6 +191,46 @@ Based on current datetime = 2023-09-06 19:04:00  (example):
 +--------------+----------+--------------+---------------------------------+---------+-------------+
 
 
+Comparing Text
+--------------
+
+Examples of using the DataComparerLibrary for comparing text in Python
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Below there are some examples how to call the methods of the DataComparerLibrary in Python::
+
+
+    a = DataComparer
+    a.compare_text_files(self, actual_file, expected_file)
+    a.compare_text_variable_with_text_file(self, actual_text_input, expected_file)
+    a.compare_text_file_with_text_variable(self, actual_file, expected_text_input)
+    a.compare_text_variables(self, actual_text_input, expected_text_input)
+
+
+Examples of using the DataComparerLibrary keywords for comparing text in Robot Framework
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Below there are some examples how to call the keywords of the DataComparerLibrary in Robot Framework::
+
+
+    *** Settings ***
+    Library     DataComparerLibrary
+
+    *** Test Cases ***
+    Testcase_DataComparer
+        Examples
+
+    *** Keywords ***
+    Examples
+        Run Keyword And Continue On Failure  DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Variable With File  ${actual_text_input}  C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text File With Text Variable  C:\\Users\\actual.txt  ${expected_text_input}
+        DataComparerLibrary.Compare Text Variables  ${actual_text_input}  ${expected_text_input}
+
+
 
 DataSorter
 ==========

datacomparerlibrary-0.843/PKG-INFO → datacomparerlibrary-0.844/README.rst

@@ -1,23 +1,3 @@
-Metadata-Version: 2.1
-Name: DataComparerLibrary
-Version: 0.843
-Summary: For comparing csv-files or 2d-array with csv-file.
-Home-page: 
-Author: René Philip Zuijderduijn
-Author-email: datacomparerlibrary@outlook.com
-License: Apache
-Keywords: robotframework testing test-automation datacompare
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Operating System :: Microsoft :: Windows :: Windows 10
-Classifier: Operating System :: Microsoft :: Windows :: Windows 11
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-
 ===================
 DataComparerLibrary
 ===================
@@ -106,8 +86,12 @@ The DataComparerLibrary can be used for:
   quotechar.
 
 
+Comparing Data
+--------------
+
+
 Examples of using the DataComparerLibrary for comparing data in Python
-----------------------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there are some examples how to call the methods of the DataComparerLibrary in Python::
 
@@ -122,7 +106,7 @@ Below there are some examples how to call the methods of the DataComparerLibrary
 
 
 Examples of using the DataComparerLibrary keywords for comparing data in Robot Framework
-----------------------------------------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there are some examples how to call the keywords of the DataComparerLibrary in Robot Framework::
 
@@ -146,7 +130,7 @@ Below there are some examples how to call the keywords of the DataComparerLibrar
 
 
 Examples comparing Actual Data with Expected Data
--------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there is an example of actual and expected data with some different cases.
 
@@ -185,6 +169,46 @@ Based on current datetime = 2023-09-06 19:04:00  (example):
 +--------------+----------+--------------+---------------------------------+---------+-------------+
 
 
+Comparing Text
+--------------
+
+Examples of using the DataComparerLibrary for comparing text in Python
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Below there are some examples how to call the methods of the DataComparerLibrary in Python::
+
+
+    a = DataComparer
+    a.compare_text_files(self, actual_file, expected_file)
+    a.compare_text_variable_with_text_file(self, actual_text_input, expected_file)
+    a.compare_text_file_with_text_variable(self, actual_file, expected_text_input)
+    a.compare_text_variables(self, actual_text_input, expected_text_input)
+
+
+Examples of using the DataComparerLibrary keywords for comparing text in Robot Framework
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Below there are some examples how to call the keywords of the DataComparerLibrary in Robot Framework::
+
+
+    *** Settings ***
+    Library     DataComparerLibrary
+
+    *** Test Cases ***
+    Testcase_DataComparer
+        Examples
+
+    *** Keywords ***
+    Examples
+        Run Keyword And Continue On Failure  DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Variable With File  ${actual_text_input}  C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text File With Text Variable  C:\\Users\\actual.txt  ${expected_text_input}
+        DataComparerLibrary.Compare Text Variables  ${actual_text_input}  ${expected_text_input}
+
+
 
 DataSorter
 ==========

{datacomparerlibrary-0.843 → datacomparerlibrary-0.844}/setup.py

@@ -22,7 +22,7 @@ with open(join(this_directory, 'src', 'DataComparerLibrary', 'version.py')) as f
 def main():
     setup(name='DataComparerLibrary',
           version=VERSION,
-          description="For comparing csv-files or 2d-array with csv-file.",
+          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.",
           long_description=README,
           long_description_content_type="text/x-rst",
           url="",
@@ -38,6 +38,8 @@ def main():
               "Programming Language :: Python :: 3.9",
               "Programming Language :: Python :: 3.10",
               "Programming Language :: Python :: 3.11",
+              "Programming Language :: Python :: 3.12",
+              "Programming Language :: Python :: 3.13",                            
           ],
           keywords='robotframework testing test-automation datacompare',
           package_dir={'': 'src'},

datacomparerlibrary-0.843/src/DataComparerLibrary/datacomparer.py → datacomparerlibrary-0.844/src/DataComparerLibrary/arraycomparer.py

@@ -1,174 +1,12 @@
-# Script for comparing actual data from an output file or a SQL-query with expected data in a file.
-#
-from array import *
-import csv
 import datetime
 import fnmatch
-import os
 import re
-
 import dateutil.relativedelta
 
-from DataComparerLibrary.tools import Tools
-
-
-class DataComparer:
-    # Situations:
-    # Actual txt file versus expected txt file.
-    # Actual csv file versus expected csv file.
-    # Array with SQL-output expected csv file.
-
-    def compare_data_2d_array_with_file(self, actual_data, expected_file, delimiter_expected_data=",", quotechar_expected_data='"'):
-        if 'actual_data' not in locals():
-            raise Exception("Input Actual data unknown.")
-        #
-        if not os.path.exists(expected_file):
-            raise Exception("Input file doesn't exists: ", expected_file)
-        #
-        print("expected_file: ", expected_file)
-        #
-        with open(expected_file, mode='rt', encoding='utf-8') as expected_file:
-            if len(delimiter_expected_data) == 1:
-                expected_data = list(csv.reader(expected_file, delimiter=delimiter_expected_data, quotechar=quotechar_expected_data))
-            else:
-                expected_data = list(csv.reader((line.replace(delimiter_expected_data, chr(255)) for line in expected_file), delimiter=chr(255), quotechar=quotechar_expected_data))
-        #
-        DataComparer.__compare_data(self, actual_data, expected_data)
-
-
-    def compare_data_file_with_2d_array(self, actual_file, expected_data, delimiter_actual_data=",", quotechar_actual_data='"'):
-        if not os.path.exists(actual_file):
-            raise Exception("Input file doesn't exists: ", actual_file)
-        #
-        if 'expected_data' not in locals():
-            raise Exception("Input Expected data unknown.")
-        #
-        print("actual_file: ", actual_file)
-        #
-        with open(actual_file, mode='rt', encoding='utf-8') as actual_file:
-            if len(delimiter_actual_data) == 1:
-                actual_data = list(csv.reader(actual_file, delimiter=delimiter_actual_data, quotechar=quotechar_actual_data))
-            else:
-                actual_data = list(csv.reader((line.replace(delimiter_actual_data, chr(255)) for line in actual_file), delimiter=chr(255), quotechar=quotechar_actual_data))
-        #
-        DataComparer.__compare_data(self, actual_data, expected_data)
-
-
-    def compare_data_2d_arrays(self, actual_data, expected_data):
-        if 'actual_data' not in locals():
-            raise Exception("Input Actual data unknown.")
-        #
-        if 'expected_data' not in locals():
-            raise Exception("Input Expected data unknown.")
-        #
-        DataComparer.__compare_data(self, actual_data, expected_data)
-
-
-    def compare_data_files(self, actual_file, expected_file, delimiter_actual_data=",", delimiter_expected_data=",", quotechar_actual_data='"', quotechar_expected_data='"'):
-        for file in (actual_file, expected_file):
-            if not os.path.exists(file):
-                raise Exception("Input file doesn't exists: ", file)
-        #
-        print("actual_file: ", actual_file)
-        print("expected_file: ", expected_file)
-        #
-        with open(actual_file, mode='rt', encoding='utf-8') as actual_file, open(expected_file, mode='rt', encoding='utf-8') as expected_file:
-            if len(delimiter_actual_data) == 1:
-                actual_data = list(csv.reader(actual_file, delimiter=delimiter_actual_data, quotechar=quotechar_actual_data))
-            else:
-                actual_data = list(csv.reader((line.replace(delimiter_actual_data, chr(255)) for line in actual_file), delimiter=chr(255), quotechar=quotechar_actual_data))
-            #
-            if len(delimiter_expected_data) == 1:
-                expected_data = list(csv.reader(expected_file, delimiter=delimiter_expected_data, quotechar=quotechar_expected_data))
-            else:
-                expected_data = list(csv.reader((line.replace(delimiter_expected_data, chr(255)) for line in expected_file), delimiter=chr(255), quotechar=quotechar_expected_data))
-        #
-        DataComparer.__compare_data(self, actual_data, expected_data)
-
-
-    def compare_text_variable_with_text_file(self, actual_text, expected_file):
-        if 'actual_data' not in locals():
-            raise Exception("Input Actual data unknown.")
-        #
-        if not os.path.exists(expected_file):
-            raise Exception("Input file doesn't exists: ", expected_file)
-        #
-        print("expected_file: ", expected_file)
-        #
-        actual_data = []
-        for line in actual_text.split('\n'):
-            actual_data.append(line.strip('\n').split(chr(255)))
-        #
-        with open(expected_file, mode='rt', encoding='utf-8') as expected_file:
-            expected_data = []
-            for line in expected_file.readlines():
-                expected_data.append(line.strip('\n').split(chr(255)))
-            #
-        DataComparer.__compare_data(self, actual_data, expected_data)
+from DataComparerLibrary.report import Report
 
-
-    def compare_text_file_with_text_variable(self, actual_file, expected_text):
-        if not os.path.exists(actual_file):
-            raise Exception("Input file doesn't exists: ", actual_file)
-        #
-        if 'expected_text' not in locals():
-            raise Exception("Input Expected data unknown.")
-        #
-        print("actual_file: ", actual_file)
-        #
-        with open(actual_file, mode='rt', encoding='utf-8') as actual_file:
-            actual_data = []
-            for line in actual_file.readlines():
-                actual_data.append(line.strip('\n').split(chr(255)))
-            #
-        expected_data = []
-        for line in expected_text.split('\n'):
-            expected_data.append(line.strip('\n').split(chr(255)))
-        #
-        DataComparer.__compare_data(self, actual_data, expected_data)
-
-
-    def compare_text_variables(self, actual_text, expected_text):
-        if 'actual_data' not in locals():
-            raise Exception("Input Actual data unknown.")
-            #
-        if 'expected_data' not in locals():
-            raise Exception("Input Expected data unknown.")
-            #
-        actual_data = []
-        for line in actual_text.split('\n'):
-            actual_data.append(line.strip('\n').split(chr(255)))
-        #
-        expected_data = []
-        for line in expected_text.split('\n'):
-            expected_data.append(line.strip('\n').split(chr(255)))
-        #
-        DataComparer.__compare_data(self, actual_data, expected_data)
-
-
-    def compare_text_files(self, actual_file, expected_file):
-        for file in (actual_file, expected_file):
-            if not os.path.exists(file):
-                raise Exception("Input file doesn't exists: ", file)
-        #
-        print("actual_file: ", actual_file)
-        print("expected_file: ", expected_file)
-        #
-        with open(actual_file, mode='rt', encoding='utf-8') as actual_file, open(expected_file, mode='rt', encoding='utf-8') as expected_file:
-            actual_data = []
-            for line in actual_file.readlines():
-                actual_data.append(line.strip('\n').split(chr(255)))
-#            print(actual_data)
-            #
-            expected_data = []
-            for line in expected_file.readlines():
-                expected_data.append(line.strip('\n').split(chr(255)))
-#            print(expected_data)
-        #
-        DataComparer.__compare_data(self, actual_data, expected_data)
-
-
-    def __compare_data(self, actual_data, expected_data_including_templates):
+class ArrayComparer:
+    def compare_data(self, actual_data, expected_data_including_templates, template_literals_dict):
         difference_found = False
         #
         if actual_data and type(actual_data[0]) is not list:  # only a single row
@@ -182,8 +20,8 @@ class DataComparer:
 
         number_of_rows = number_of_rows_actual_data if (number_of_rows_actual_data >= number_of_rows_expected_data) else number_of_rows_expected_data
 
-        DataComparer.__print_2d_array(self, "Actual data", actual_data, 20)
-        DataComparer.__print_2d_array(self, "Expected data", expected_data_including_templates, 20)
+        Report.show_2d_array(self, "Actual data", actual_data, 20)
+        Report.show_2d_array(self, "Expected data", expected_data_including_templates, 20)
 
         print()
         print("=== Overview differences between actual and expected data")
@@ -193,17 +31,17 @@ class DataComparer:
             if row_nr >= number_of_rows_actual_data:
                 difference_found = True
                 if len(expected_data_including_templates[row_nr]) == 0:
-                    DataComparer.__print_comparation_result(self, row_nr, 0, "", "", "Row actual data is not PRESENT. Row expected data is EMPTY.")
+                    Report.show_comparation_result(self, row_nr, 0, "", "", "Row actual data is not PRESENT. Row expected data is EMPTY.")
                 else:
-                    DataComparer.__print_comparation_result(self, row_nr, 0, "", expected_data_including_templates[row_nr][0], "Row actual data is not PRESENT.")
+                    Report.show_comparation_result(self, row_nr, 0, "", expected_data_including_templates[row_nr][0], "Row actual data is not PRESENT.")
                 continue
             #
             if row_nr >= number_of_rows_expected_data:
                 difference_found = True
                 if len(actual_data[row_nr]) == 0:
-                    DataComparer.__print_comparation_result(self, row_nr, 0, "", "", "Row actual data is EMPTY. Row expected data is not PRESENT.")
+                    Report.show_comparation_result(self, row_nr, 0, "", "", "Row actual data is EMPTY. Row expected data is not PRESENT.")
                 else:
-                    DataComparer.__print_comparation_result(self, row_nr, 0, actual_data[row_nr][0], "", "Row expected data is not PRESENT.")
+                    Report.show_comparation_result(self, row_nr, 0, actual_data[row_nr][0], "", "Row expected data is not PRESENT.")
                 continue
             #
             number_of_columns_actual_data   = len(actual_data[row_nr])
@@ -218,23 +56,35 @@ class DataComparer:
                 #
                 if column_nr >= number_of_columns_actual_data:
                     difference_found = True
-                    DataComparer.__print_comparation_result(self, row_nr, column_nr, "", expected_data_including_templates[row_nr][column_nr], "Column actual data is not PRESENT.")
+                    Report.show_comparation_result(self, row_nr, column_nr, "", expected_data_including_templates[row_nr][column_nr], "Column actual data is not PRESENT.")
                     continue
                 #
                 if column_nr >= number_of_columns_expected_data:
                     difference_found = True
-                    DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], "", "Column expected data is not PRESENT.")
+                    Report.show_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], "", "Column expected data is not PRESENT.")
                     continue
                 #
                 if actual_data[row_nr][column_nr] != expected_data_including_templates[row_nr][column_nr]:
+                    # Replace literal templates with fixed external strings.
+                    if template_literals_dict:
+                        for i in range(0, len(template_literals_dict)):
+#                           key = list(template_literals_dict.keys())[i]
+#                           value = list(template_literals_dict.values())[i]
+#                           print("key: ", key)
+#                           print("value: ", value)
+                            expected_data_including_templates[row_nr][column_nr] = expected_data_including_templates[row_nr][column_nr].replace(list(template_literals_dict.keys())[i], list(template_literals_dict.values())[i])
+#                           print("actual_data[row_nr][column_nr]: \n", actual_data[row_nr][column_nr])
+#                           print("expected_data_including_templates[row_nr][column_nr]: \n", expected_data_including_templates[row_nr][column_nr])
+
+
                     # 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.")
+                            Report.show_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.")
+                            Report.show_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.
@@ -243,13 +93,13 @@ class DataComparer:
                             if not actual_data[row_nr][column_nr]:
                                 # No data is present in actual data field.
                                 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 is not PRESENT")
+                                Report.show_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "Actual data field is not PRESENT")
                         #
                         case "{EMPTY}":
                             if actual_data[row_nr][column_nr]:
                                 # Actual data field is not empty.
                                 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 is not EMPTY")
+                                Report.show_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "Actual data field is not EMPTY")
                         #
                         case "{INTEGER}":
                             if isinstance(actual_data[row_nr][column_nr], int):
@@ -260,7 +110,7 @@ class DataComparer:
                             if not actual_data[row_nr][column_nr].isdigit():
                                 # Not positive integer field.
                                 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 is not INTEGER.")
+                                Report.show_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "Actual data field is not INTEGER.")
                         #
                         case "{SKIP}":
                             pass
@@ -292,41 +142,41 @@ class DataComparer:
                                 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.")
+                                    Report.show_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.")
                                     continue
                                 #
-                                expected_data = DataComparer.__replace_date_template_in_expected_data(self, expected_data_including_date_template)
+                                expected_data = ArrayComparer.__replace_date_template_in_expected_data(self, expected_data_including_date_template)
                                 #
                                 if 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], "NOW() has been found in expected data field, but format is incorrect.")
+                                    Report.show_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.")
                                 else:
                                     if not fnmatch.fnmatch(actual_data[row_nr][column_nr], expected_data):
                                         # No match despite using of wildcard(s).
                                         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.")
+                                        Report.show_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.")
+                                        Report.show_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
                                 #
                             elif "{NOT(" in expected_data_including_templates[row_nr][column_nr].upper():
                                 try:
-                                    unwanted_expected_data = DataComparer.__get_unwanted_expected_data(self, expected_data_including_date_template)
+                                    unwanted_expected_data = ArrayComparer.__get_unwanted_expected_data(self, expected_data_including_date_template)
                                     #
                                     if 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!!!")
+                                        Report.show_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.")
+                                        Report.show_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!!!")
                                 except Exception as exception_message:
                                     # print(f"An exception occurred: {exception_message}")
                                     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.")
+                                    Report.show_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 not skip_exception_rule_used:
                                     # No exceptions.
                                     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.")
+                                    Report.show_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.")
                             #
         if difference_found:
             print("\n\n\n")
@@ -347,7 +197,7 @@ class DataComparer:
         # Close brace of TODAY has been 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 = DataComparer.__convert_datetime_template_to_datetime(self, expected_datetime_template_string)
+        expected_datetime_string = ArrayComparer.__convert_datetime_template_to_datetime(self, expected_datetime_template_string)
         #
         if expected_datetime_string == -1:
             return -1
@@ -380,7 +230,7 @@ class DataComparer:
                 else:
                     # Adjust date time based on current date time.
                     relative_datetime_template_string = template_datetime_string_splitted[0].replace('{NOW()', '')
-                    relative_datetime = DataComparer.__convert_relative_datetime_template_to_relative_datetime(self, relative_datetime_template_string[1:len(relative_datetime_template_string)])
+                    relative_datetime = ArrayComparer.__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:
@@ -433,29 +283,6 @@ class DataComparer:
             return -1
 
 
-    def __print_2d_array(self, title, reader_file_list, column_width):
-        max_length_title = 30
-        title = title[0:(max_length_title - 1)]
-        length_title = len(title)
-        print("=== ", title, " ", end="")
-        print("=" * (max_length_title - length_title))
-        print()
-        #
-        for row in reader_file_list:
-            for cell_value in row:
-                #if isinstance(cell_value, str):
-                if isinstance(cell_value, str) or isinstance(cell_value, int):
-                    #print('{val:{fill}{width}}'.format(val=cell_value, fill='', width=column_width), end="  ")
-                    print('{val:{fill}{width}}'.format(val=cell_value, fill='', width=column_width, left_aligned=True), end="  ")
-
-            print()
-        print()
-        print()
-
-
-    def __print_comparation_result(self, row_number, column_number, actual_data, expected_data, error_message):
-        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 = expected_data_field_including_date_template.find("{NOT(")
@@ -471,7 +298,7 @@ class DataComparer:
         #
         unwanted_expected_data = expected_data_field_including_date_template[position_open_brace+5:position_close_brace]
         #
-        if DataComparer.is_integer(self, unwanted_expected_data):
+        if ArrayComparer.is_integer(self, unwanted_expected_data):
             unwanted_expected_data = int(unwanted_expected_data)
         return unwanted_expected_data
 

datacomparerlibrary-0.844/src/DataComparerLibrary/datacomparer.py

@@ -0,0 +1,135 @@
+# Script for comparing csv-files, 2d-array with a csv-file or 2d-arrays and for comparing text-files, text variable with a text-file or text variables.
+#
+import csv
+import os
+
+from DataComparerLibrary.arraycomparer import ArrayComparer
+
+
+class DataComparer:
+    def compare_data_2d_array_with_file(self, actual_data, expected_file, delimiter_expected_data=",", quotechar_expected_data='"', template_literals_dict=None):
+        self.__check_if_actual_data_is_present(actual_data)
+        self.__check_if_expected_file_is_present(expected_file)        
+        #
+        expected_data = self.__open_csv_input_file(expected_file, delimiter_expected_data, quotechar_expected_data)
+        #
+        ArrayComparer.compare_data(self, actual_data, expected_data, template_literals_dict)
+
+
+    def compare_data_file_with_2d_array(self, actual_file, expected_data, delimiter_actual_data=",", quotechar_actual_data='"', template_literals_dict=None):
+        self.__check_if_actual_file_is_present(actual_file)      
+        self.__check_if_expected_data_is_present(expected_data)
+        #
+        actual_data = self.__open_csv_input_file(actual_file, delimiter_actual_data, quotechar_actual_data)
+        #
+        ArrayComparer.compare_data(self, actual_data, expected_data, template_literals_dict)
+
+
+    def compare_data_2d_arrays(self, actual_data, expected_data, template_literals_dict=None):
+        self.__check_if_actual_data_is_present(actual_data)
+        self.__check_if_expected_data_is_present(expected_data) 
+        #
+        ArrayComparer.compare_data(self, actual_data, expected_data, template_literals_dict)
+
+
+    def compare_data_files(self, actual_file, expected_file, delimiter_actual_data=",", delimiter_expected_data=",", quotechar_actual_data='"', quotechar_expected_data='"', template_literals_dict=None):
+        self.__check_if_actual_file_is_present(actual_file) 
+        self.__check_if_expected_file_is_present(expected_file)            
+        #
+        actual_data = self.__open_csv_input_file(actual_file, delimiter_actual_data, quotechar_actual_data)
+        expected_data = self.__open_csv_input_file(expected_file, delimiter_expected_data, quotechar_expected_data)
+        #
+        ArrayComparer.compare_data(self, actual_data, expected_data, template_literals_dict)
+
+
+    def compare_text_variable_with_text_file(self, actual_text, expected_file, template_literals_dict=None):
+        self.__check_if_actual_data_is_present(actual_text)
+        self.__check_if_expected_file_is_present(expected_file)        
+        #
+        actual_data = self.__split_text_into_textline_array(actual_text)
+        expected_data = self.__split_textfile_into_textline_array(expected_file)
+        #
+        ArrayComparer.compare_data(self, actual_data, expected_data, template_literals_dict)
+
+
+    def compare_text_file_with_text_variable(self, actual_file, expected_text, template_literals_dict=None):
+        self.__check_if_actual_file_is_present(actual_file)      
+        self.__check_if_expected_data_is_present(expected_text)
+        #
+        actual_data = self.__split_textfile_into_textline_array(actual_file)
+        expected_data = self.__split_text_into_textline_array(expected_text)
+        #
+        ArrayComparer.compare_data(self, actual_data, expected_data, template_literals_dict)
+
+
+    def compare_text_variables(self, actual_text, expected_text, template_literals_dict=None):
+        self.__check_if_actual_data_is_present(actual_text)
+        self.__check_if_expected_data_is_present(expected_text) 
+        #
+        actual_data = self.__split_text_into_textline_array(actual_text)
+        expected_data = self.__split_text_into_textline_array(expected_text)        
+        #
+        ArrayComparer.compare_data(self, actual_data, expected_data, template_literals_dict)
+
+
+    def compare_text_files(self, actual_file, expected_file, template_literals_dict=None):
+        self.__check_if_actual_file_is_present(actual_file) 
+        self.__check_if_expected_file_is_present(expected_file)            
+        #
+        actual_data = self.__split_textfile_into_textline_array(actual_file)        
+        expected_data = self.__split_textfile_into_textline_array(expected_file)
+        #
+        ArrayComparer.compare_data(self, actual_data, expected_data, template_literals_dict)
+
+
+
+    def __check_if_actual_data_is_present(self, data):
+        if data == None:
+            raise Exception("Actual Input data unknown.")        
+
+
+    def __check_if_expected_data_is_present(self, data):
+        if data == None:
+            raise Exception("Expected Input data unknown.")        
+
+
+    def __check_if_actual_file_is_present(self, file):
+        if os.path.exists(file):
+            print("actual_file: ", file)
+        else:
+            raise Exception("Actual Input file doesn't exists: ", file)
+
+
+    def __check_if_expected_file_is_present(self, file):
+        if os.path.exists(file):
+            print("expected_file: ", file)    
+        else:
+            raise Exception("Expected Input file doesn't exists: ", file)  
+        
+
+    def __open_csv_input_file(self, input_file, delimiter_data=",", quotechar_data='"'):
+        with open(input_file, mode='rt', encoding='utf-8') as input_file:
+            if len(delimiter_data) == 1:
+                data = list(csv.reader(input_file, delimiter=delimiter_data, quotechar=quotechar_data))
+            else:
+                data = list(csv.reader((line.replace(delimiter_data, chr(255)) for line in input_file), delimiter=chr(255), quotechar=quotechar_data))
+        #
+        return data        
+    
+
+    def __split_text_into_textline_array(self, text):
+        data = []
+        for line in text.split('\n'):
+            data.append(line.strip('\n').split(chr(255)))
+        #
+        return data
+    
+
+    def __split_textfile_into_textline_array(self, input_file):
+        with open(input_file, mode='rt', encoding='utf-8') as input_file:
+            data = []
+            for line in input_file.readlines():
+                data.append(line.strip('\n').split(chr(255)))
+        #
+        return data
+    

datacomparerlibrary-0.844/src/DataComparerLibrary/report.py

@@ -0,0 +1,23 @@
+class Report:
+    def show_2d_array(self, title, reader_file_list, column_width):
+        max_length_title = 30
+        title = title[0:(max_length_title - 1)]
+        length_title = len(title)
+        print("=== ", title, " ", end="")
+        print("=" * (max_length_title - length_title))
+        print()
+        #
+        for row in reader_file_list:
+            for cell_value in row:
+                #if isinstance(cell_value, str):
+                if isinstance(cell_value, str) or isinstance(cell_value, int):
+                    #print('{val:{fill}{width}}'.format(val=cell_value, fill='', width=column_width), end="  ")
+                    print('{val:{fill}{width}}'.format(val=cell_value, fill='', width=column_width, left_aligned=True), end="  ")
+
+            print()
+        print()
+        print()
+
+
+    def show_comparation_result(self, row_number, column_number, actual_data, expected_data, error_message):
+        print("Row: ", row_number + 1, "  Column: ", column_number + 1, "  =>  Actual data: ", actual_data, "    Expected data: ", expected_data, "    Remark / Error message: ", error_message)

datacomparerlibrary-0.844/src/DataComparerLibrary/version.py

@@ -0,0 +1,3 @@
+# encoding=utf-8
+
+VERSION = '0.844'

datacomparerlibrary-0.843/README.rst → datacomparerlibrary-0.844/src/DataComparerLibrary.egg-info/PKG-INFO

@@ -1,3 +1,25 @@
+Metadata-Version: 2.1
+Name: DataComparerLibrary
+Version: 0.844
+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.
+Home-page: 
+Author: René Philip Zuijderduijn
+Author-email: datacomparerlibrary@outlook.com
+License: Apache
+Keywords: robotframework testing test-automation datacompare
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: Microsoft :: Windows :: Windows 10
+Classifier: Operating System :: Microsoft :: Windows :: Windows 11
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+
 ===================
 DataComparerLibrary
 ===================
@@ -86,8 +108,12 @@ The DataComparerLibrary can be used for:
   quotechar.
 
 
+Comparing Data
+--------------
+
+
 Examples of using the DataComparerLibrary for comparing data in Python
-----------------------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there are some examples how to call the methods of the DataComparerLibrary in Python::
 
@@ -102,7 +128,7 @@ Below there are some examples how to call the methods of the DataComparerLibrary
 
 
 Examples of using the DataComparerLibrary keywords for comparing data in Robot Framework
-----------------------------------------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there are some examples how to call the keywords of the DataComparerLibrary in Robot Framework::
 
@@ -126,7 +152,7 @@ Below there are some examples how to call the keywords of the DataComparerLibrar
 
 
 Examples comparing Actual Data with Expected Data
--------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Below there is an example of actual and expected data with some different cases.
 
@@ -165,6 +191,46 @@ Based on current datetime = 2023-09-06 19:04:00  (example):
 +--------------+----------+--------------+---------------------------------+---------+-------------+
 
 
+Comparing Text
+--------------
+
+Examples of using the DataComparerLibrary for comparing text in Python
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Below there are some examples how to call the methods of the DataComparerLibrary in Python::
+
+
+    a = DataComparer
+    a.compare_text_files(self, actual_file, expected_file)
+    a.compare_text_variable_with_text_file(self, actual_text_input, expected_file)
+    a.compare_text_file_with_text_variable(self, actual_file, expected_text_input)
+    a.compare_text_variables(self, actual_text_input, expected_text_input)
+
+
+Examples of using the DataComparerLibrary keywords for comparing text in Robot Framework
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Below there are some examples how to call the keywords of the DataComparerLibrary in Robot Framework::
+
+
+    *** Settings ***
+    Library     DataComparerLibrary
+
+    *** Test Cases ***
+    Testcase_DataComparer
+        Examples
+
+    *** Keywords ***
+    Examples
+        Run Keyword And Continue On Failure  DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Files  C:\\Users\\actual.txt   C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text Variable With File  ${actual_text_input}  C:\\Users\\expected.txt
+        DataComparerLibrary.Compare Text File With Text Variable  C:\\Users\\actual.txt  ${expected_text_input}
+        DataComparerLibrary.Compare Text Variables  ${actual_text_input}  ${expected_text_input}
+
+
 
 DataSorter
 ==========

{datacomparerlibrary-0.843 → datacomparerlibrary-0.844}/src/DataComparerLibrary.egg-info/SOURCES.txt

@@ -3,10 +3,12 @@ README.rst
 pyproject.toml
 setup.py
 src/DataComparerLibrary/__init__.py
+src/DataComparerLibrary/arraycomparer.py
 src/DataComparerLibrary/datacomparer.py
 src/DataComparerLibrary/datasorter.py
 src/DataComparerLibrary/delimitertranslator.py
 src/DataComparerLibrary/fileconverter.py
+src/DataComparerLibrary/report.py
 src/DataComparerLibrary/tools.py
 src/DataComparerLibrary/version.py
 src/DataComparerLibrary.egg-info/PKG-INFO

datacomparerlibrary-0.843/src/DataComparerLibrary/version.py

@@ -1,3 +0,0 @@
-# encoding=utf-8
-
-VERSION = '0.843'