DataComparerLibrary 0.800__tar.gz → 0.810__tar.gz

{DataComparerLibrary-0.800 → DataComparerLibrary-0.810}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DataComparerLibrary
-Version: 0.800
+Version: 0.810
 Summary: For comparing csv-files or 2d-array with csv-file.
 Home-page: 
 Author: René Philip Zuijderduijn
@@ -62,7 +62,7 @@ current date. At "Examples comparing Actual Data with Expected Data" you can fin
 
 Delimiter
 Default delimiter is ",". You can use the option "delimiter_actual_data" and "delimiter_expected_data" to set another
-delimiter like ";" or "tab".
+delimiter like ";" or "\t" for tab. It is also possible to use a multi-character delimiter like "@#@".
 
 
 Installation
@@ -90,6 +90,7 @@ Below there are some examples how to call the methods of the DataComparerLibrary
     a = DataComparer
     a.compare_data_files(self, actual_file, expected_file)
     a.compare_data_files(self, actual_file, expected_file, delimiter_actual_data=';', delimiter_expected_data=';')
+    a.compare_data_files(self, actual_file, expected_file, delimiter_actual_data='@#@', delimiter_expected_data='@#@')
     a.compare_data_2d_array_with_file(self, actual_2d_matrix_data_input, expected_file, delimiter_expected_data='\t')
     a.compare_data_file_with_2d_array(self, actual_file, expected_2d_matrix_data_input, delimiter_actual_data=';')
     a.compare_data_2d_arrays(self, actual_2d_matrix_data_input, expected_2d_matrix_data_input)
@@ -112,6 +113,7 @@ Below there are some examples how to call the keywords of the DataComparerLibrar
     Examples
         Run Keyword And Continue On Failure  DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv
         DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv  delimiter_actual_data=;  delimiter_expected_data=;
+        DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv  delimiter_actual_data=@#@  delimiter_expected_data=@#@
         DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv
         DataComparerLibrary.Compare Data 2d Array With File  ${actual_2d_matrix_data_input}  C:\\Users\\expected.csv  delimiter_expected_data=\t
         DataComparerLibrary.Compare Data File With 2d Array  C:\\Users\\actual.csv  ${expected_2d_matrix_data_input}  delimiter_actual_data=;

{DataComparerLibrary-0.800 → DataComparerLibrary-0.810}/README.rst

@@ -43,7 +43,7 @@ current date. At "Examples comparing Actual Data with Expected Data" you can fin
 
 Delimiter
 Default delimiter is ",". You can use the option "delimiter_actual_data" and "delimiter_expected_data" to set another
-delimiter like ";" or "tab".
+delimiter like ";" or "\t" for tab. It is also possible to use a multi-character delimiter like "@#@".
 
 
 Installation
@@ -71,6 +71,7 @@ Below there are some examples how to call the methods of the DataComparerLibrary
     a = DataComparer
     a.compare_data_files(self, actual_file, expected_file)
     a.compare_data_files(self, actual_file, expected_file, delimiter_actual_data=';', delimiter_expected_data=';')
+    a.compare_data_files(self, actual_file, expected_file, delimiter_actual_data='@#@', delimiter_expected_data='@#@')
     a.compare_data_2d_array_with_file(self, actual_2d_matrix_data_input, expected_file, delimiter_expected_data='\t')
     a.compare_data_file_with_2d_array(self, actual_file, expected_2d_matrix_data_input, delimiter_actual_data=';')
     a.compare_data_2d_arrays(self, actual_2d_matrix_data_input, expected_2d_matrix_data_input)
@@ -93,6 +94,7 @@ Below there are some examples how to call the keywords of the DataComparerLibrar
     Examples
         Run Keyword And Continue On Failure  DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv
         DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv  delimiter_actual_data=;  delimiter_expected_data=;
+        DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv  delimiter_actual_data=@#@  delimiter_expected_data=@#@
         DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv
         DataComparerLibrary.Compare Data 2d Array With File  ${actual_2d_matrix_data_input}  C:\\Users\\expected.csv  delimiter_expected_data=\t
         DataComparerLibrary.Compare Data File With 2d Array  C:\\Users\\actual.csv  ${expected_2d_matrix_data_input}  delimiter_actual_data=;

{DataComparerLibrary-0.800 → DataComparerLibrary-0.810}/src/DataComparerLibrary/datacomparer.py

@@ -16,7 +16,7 @@ class DataComparer:
     # 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=None, quotechar_expected_data=None):
+    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.")
         #
@@ -25,15 +25,12 @@ class DataComparer:
         #
         print("expected_file: ", expected_file)
         #
-        if delimiter_expected_data is None:
-            delimiter_expected_data = ","
-        #
-        if quotechar_expected_data is None:
-            quotechar_expected_data = '"'
-        #
         with open(expected_file, mode='rt', encoding='utf-8') as expected_file:
             time.sleep(1)
-            expected_data = list(csv.reader(expected_file, delimiter=delimiter_expected_data, quotechar=quotechar_expected_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))
         #
         if actual_data == [] and expected_data == []:
             raise Exception("Actual and Expected data are not present. Actual data input 2d-array and Expected data input file are empty.")
@@ -47,7 +44,7 @@ class DataComparer:
         DataComparer.__compare_data(self, actual_data, expected_data)
 
 
-    def compare_data_file_with_2d_array(self, actual_file, expected_data, delimiter_actual_data=None, quotechar_actual_data=None):
+    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)
         #
@@ -56,15 +53,12 @@ class DataComparer:
         #
         print("actual_file: ", actual_file)
         #
-        if delimiter_actual_data is None:
-            delimiter_actual_data = ","
-        #
-        if quotechar_actual_data is None:
-            quotechar_actual_data = '"'
-        #
         with open(actual_file, mode='rt', encoding='utf-8') as actual_file:
             time.sleep(1)
-            actual_data = list(csv.reader(actual_file, delimiter=delimiter_actual_data, quotechar=quotechar_actual_data))
+            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 actual_data == [] and expected_data == []:
             raise Exception("Actual and Expected data are not present. Actual data input file and Expected data input 2d-array are empty.")
@@ -97,7 +91,7 @@ class DataComparer:
         DataComparer.__compare_data(self, actual_data, expected_data)
 
 
-    def compare_data_files(self, actual_file, expected_file, delimiter_actual_data=None, delimiter_expected_data=None, quotechar_actual_data=None, quotechar_expected_data=None):
+    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)
@@ -105,22 +99,17 @@ class DataComparer:
         print("actual_file: ", actual_file)
         print("expected_file: ", expected_file)
         #
-        if delimiter_actual_data is None:
-            delimiter_actual_data = ","
-        #
-        if delimiter_expected_data is None:
-            delimiter_expected_data = ","
-        #
-        if quotechar_actual_data is None:
-            quotechar_actual_data = '"'
-        #
-        if quotechar_expected_data is None:
-            quotechar_expected_data = '"'
-        #
         with open(actual_file, mode='rt', encoding='utf-8') as actual_file, open(expected_file, mode='rt', encoding='utf-8') as expected_file:
             time.sleep(1)
-            actual_data = list(csv.reader(actual_file, delimiter=delimiter_actual_data, quotechar=quotechar_actual_data))
-            expected_data = list(csv.reader(expected_file, delimiter=delimiter_expected_data, quotechar=quotechar_expected_data))
+            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))
         #
         if actual_data == [] and expected_data == []:
             raise Exception("Actual and Expected data are not present. Input files are empty.")
@@ -361,7 +350,6 @@ class DataComparer:
             if param:
                 period_name = name
                 period_count = param
-                #period_names = ["years", "months", "days"]
                 #
                 if period_name in period_names:
                     kwargs[period_name] = int(period_count)
@@ -387,7 +375,6 @@ class DataComparer:
         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)
-
-

{DataComparerLibrary-0.800 → DataComparerLibrary-0.810}/src/DataComparerLibrary/version.py

@@ -1,3 +1,3 @@
 # encoding=utf-8
 
-VERSION = '0.800'
+VERSION = '0.810'

{DataComparerLibrary-0.800 → DataComparerLibrary-0.810}/src/DataComparerLibrary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DataComparerLibrary
-Version: 0.800
+Version: 0.810
 Summary: For comparing csv-files or 2d-array with csv-file.
 Home-page: 
 Author: René Philip Zuijderduijn
@@ -62,7 +62,7 @@ current date. At "Examples comparing Actual Data with Expected Data" you can fin
 
 Delimiter
 Default delimiter is ",". You can use the option "delimiter_actual_data" and "delimiter_expected_data" to set another
-delimiter like ";" or "tab".
+delimiter like ";" or "\t" for tab. It is also possible to use a multi-character delimiter like "@#@".
 
 
 Installation
@@ -90,6 +90,7 @@ Below there are some examples how to call the methods of the DataComparerLibrary
     a = DataComparer
     a.compare_data_files(self, actual_file, expected_file)
     a.compare_data_files(self, actual_file, expected_file, delimiter_actual_data=';', delimiter_expected_data=';')
+    a.compare_data_files(self, actual_file, expected_file, delimiter_actual_data='@#@', delimiter_expected_data='@#@')
     a.compare_data_2d_array_with_file(self, actual_2d_matrix_data_input, expected_file, delimiter_expected_data='\t')
     a.compare_data_file_with_2d_array(self, actual_file, expected_2d_matrix_data_input, delimiter_actual_data=';')
     a.compare_data_2d_arrays(self, actual_2d_matrix_data_input, expected_2d_matrix_data_input)
@@ -112,6 +113,7 @@ Below there are some examples how to call the keywords of the DataComparerLibrar
     Examples
         Run Keyword And Continue On Failure  DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv
         DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv  delimiter_actual_data=;  delimiter_expected_data=;
+        DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv  delimiter_actual_data=@#@  delimiter_expected_data=@#@
         DataComparerLibrary.Compare Data Files  C:\\Users\\actual.csv   C:\\Users\\expected.csv
         DataComparerLibrary.Compare Data 2d Array With File  ${actual_2d_matrix_data_input}  C:\\Users\\expected.csv  delimiter_expected_data=\t
         DataComparerLibrary.Compare Data File With 2d Array  C:\\Users\\actual.csv  ${expected_2d_matrix_data_input}  delimiter_actual_data=;