Merge pull request #7 from qahive/enhance-support-new-line-data-column

Add support field with newline by replace with under score

Author: atthaboon

Examples/BasicDataDrivenExample.robot

@@ -2,13 +2,18 @@
 Library    ExcelDataDriver    ./test_data/BasicDemoData.xlsx    capture_screenshot=Skip    main_column_key=username
 Test Template    Validate user data template
 
+*** Variables ***
+${username}    ${EMPTY}
+
 *** Test Cases ***
-Verify valid user '${username}'    ${None}    ${None}    ${None}
+Verify valid user '${username}'    ${None}    ${None}    ${None}    ${None}
 
 *** Keywords ***
 Validate user data template
-    [Arguments]    ${username}     ${password}    ${email}
+    [Arguments]    ${username}     ${password}    ${email}    ${data_new_line}
     Log    ${username}
     Log    ${password}
     Log    ${email}
+    Log    ${data_new_line}
+    Should Not Be Equal    ${data_new_line}    ${None}
     Should Not Be Equal    ${password}    ${None}

Examples/CustomParserExample.robot

@@ -3,6 +3,8 @@ Library    CustomExcelParser/CustomExcelParser.py
 Library    ExcelDataDriver    ./test_data/Custom_Template.xlsx    main_column_key=sku    custom_parser=CustomExcelParser    capture_screenshot=OnFailed
 Test Template    Demo template
 
+*** Variables ***
+${sku}    ${EMPTY}
 
 *** Test Cases ***
 Product promo price update for SKU '${sku}'    ${None}    ${None}    ${None}    ${None}    ${None}    ${None}    ${None}    ${None}    ${None}

Examples/SeleniumDataDrivenExample.robot

@@ -54,7 +54,7 @@ def parsing_major_column_indexs(self, ws):
                     found_default_column_indexs = True
 
                 if (cell.value is not None) and (cell.value not in self.DEFAULT_COLUMN_INDEXS) and (found_default_column_indexs is False):
-                    field_name = str(cell.value).lower().strip().replace(" ", "_")
+                    field_name = self._cleanup_fieldname(cell.value)
                     if field_name == self.main_column_key:
                         key_index_row = index + 1
 
@@ -87,7 +87,7 @@ def parsing_column_indexs(self, ws):
                 continue
             for cell in row:
                 if (cell.value is not None) and (cell.value not in self.DEFAULT_COLUMN_INDEXS):
-                    field_name = str(cell.value).lower().strip().replace(" ", "_")
+                    field_name = self._cleanup_fieldname(cell.value)
                     ws_column_indexs[field_name] = column_index_from_string(coordinate_from_string(cell.coordinate)[0])
                     print(str(datetime.now())+': Optional : '+field_name + ' : ' + str(cell.coordinate) + ' : ' + str(column_index_from_string(coordinate_from_string(cell.coordinate)[0])))
             break
@@ -107,3 +107,9 @@ def parse_test_data_properties(self, ws, ws_column_indexs):
         print(str(datetime.now())+': Total test datas: ' + str(len(test_datas)))
         return test_datas
 
+    def _cleanup_fieldname(self, field_name):
+        field_name = str(field_name).lower().strip().replace(" ", "_")
+        field_name = field_name.replace("\r", "_")
+        field_name = field_name.replace("\n", "_")
+        field_name = field_name.replace("__", "_")
+        return field_name