Clean up example script

qahive · May 26, 2020 · 654086a · 654086a
1 parent 3bce11b
commit 654086a
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 26 deletions.
diff --git a/Examples/BasicDataDrivenExample.robot b/Examples/BasicDataDrivenExample.robot
@@ -1,5 +1,5 @@
 *** Setting ***
-Library    ExcelDataDriver    ./test_data/BasicDemoData.xlsx    capture_screenshot=Skip
+Library    ExcelDataDriver    ./test_data/BasicDemoData.xlsx    capture_screenshot=Skip    main_column_key=username
 Test Template    Validate user data template
 
 *** Test Cases ***
@@ -11,5 +11,4 @@ Validate user data template
     Log    ${username}
     Log    ${password}
     Log    ${email}
-    Should Be True    '${password}' != '${None}'
-    # Should Match Regexp    ${email}    [A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}
+    Should Not Be Equal    ${password}    ${None}
diff --git a/Examples/CustomExcelParser/CustomExcelParser.py b/Examples/CustomExcelParser/CustomExcelParser.py
@@ -6,11 +6,11 @@
 
 class CustomExcelParser(ABCParserStrategy):
 
-    def __init__(self):
-        ABCParserStrategy.__init__(self)
+    def __init__(self, main_column_key=None):
+        ABCParserStrategy.__init__(self, main_column_key)
         print('Using CustomExcelParser')
-        self.maximum_column_index_row = 3
-        self.start_row = 1
+        self.maximum_column_index_row = 2
+        self.start_row = 3
 
     def parsing_column_indexs(self, ws):
         '''

diff --git a/Examples/CustomParserExample.robot b/Examples/CustomParserExample.robot
@@ -1,12 +1,12 @@
 *** Setting ***
-Library    CustomExcelParser/CustomExcelParser.py    
-Library    ExcelDataDriver    ./test_data/Custom_Template.xlsx    custom_parser=CustomExcelParser    capture_screenshot=OnFailed
+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
 
 
 *** Test Cases ***
 Product promo price update for SKU '${sku}'    ${None}    ${None}    ${None}    ${None}    ${None}    ${None}    ${None}    ${None}    ${None}
-    
+
 *** Keywords ***
 Demo template
     [Arguments]    ${sku}    ${normal price}    ${normal cost in vat}    ${normal cost ex vat}    ${normal cost gp}    ${promotion price}    ${promotion cost in vat}    ${promotion cost ex vat}    ${promotion cost gp}

diff --git a/Examples/MergedSummaryReportExample.robot b/Examples/MergedSummaryReportExample.robot
@@ -1,12 +1,11 @@
 *** Setting ***
 Library    String
 Library    Collections    
-Library    OperatingSystem    
-Library    SeleniumLibrary
+Library    OperatingSystem
 Library    ./CustomExcelParser/CustomExcelParser.py    
 Library    ExcelDataDriver    manually_test=${True}
 
 
 *** Tasks ***
 Summary_test_result
-    Merged Excel Report    CustomExcelParser
+    Merged Excel Report    sku    CustomExcelParser
diff --git a/Examples/Parse_Product_Removal_Activity.robot b/Examples/Parse_Product_Removal_Activity.robot
diff --git a/Examples/SeleniumDataDrivenExample.robot b/Examples/SeleniumDataDrivenExample.robot
@@ -1,6 +1,6 @@
 *** Setting ***
 Library    SeleniumLibrary
-Library    ExcelDataDriver    ./test_data/DefaultDemoData.xlsx    capture_screenshot_when_fail_only=${True}
+Library    ExcelDataDriver    ./test_data/DefaultDemoData.xlsx     main_column_key=username    capture_screenshot=OnFailed
 Test Template    Invalid login
 Suite Teardown    Close All Browsers
 

diff --git a/Examples/test_data/BasicDemoData.xlsx b/Examples/test_data/BasicDemoData.xlsx
diff --git a/Examples/test_data/Custom_Template.xlsx b/Examples/test_data/Custom_Template.xlsx
diff --git a/Examples/test_data/Product_Removal_Activity_Template.xlsx b/Examples/test_data/Product_Removal_Activity_Template.xlsx