From 1854a350d9e66489df3625528648c174a166255a Mon Sep 17 00:00:00 2001 From: damies13 Date: Wed, 16 Oct 2024 12:09:55 +1000 Subject: [PATCH] Tuning test data Issue #239 --- Tests/Regression/Reporter/GUI_Bugs.robot | 2 +- Tests/Regression/Reporter/GUI_Features.robot | 9 ++- .../20230728_130340_Odoo-demo.report | 55 ------------------- .../testdata/Issue-#140/RFSwarmReporter.ini | 2 +- .../{old.template => original_base.template} | 0 5 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 Tests/Regression/Reporter/testdata/Issue-#140/20230728_130340_Odoo-demo/20230728_130340_Odoo-demo.report rename Tests/Regression/Reporter/testdata/Issue-#140/{old.template => original_base.template} (100%) diff --git a/Tests/Regression/Reporter/GUI_Bugs.robot b/Tests/Regression/Reporter/GUI_Bugs.robot index fab4ac4b2..a3829e7f4 100644 --- a/Tests/Regression/Reporter/GUI_Bugs.robot +++ b/Tests/Regression/Reporter/GUI_Bugs.robot @@ -260,7 +260,7 @@ Template with Start and End Dates Save Template File OS DIALOG ${templatename} Click Button GenerateHTML - Wait For Status GeneratingXHTMLReport + # Wait For Status GeneratingXHTMLReport Wait For Status SavedXHTMLReport Sleep 1 Close GUI diff --git a/Tests/Regression/Reporter/GUI_Features.robot b/Tests/Regression/Reporter/GUI_Features.robot index d9bf03695..dfd418b5b 100644 --- a/Tests/Regression/Reporter/GUI_Features.robot +++ b/Tests/Regression/Reporter/GUI_Features.robot @@ -186,12 +186,13 @@ Verify Plan Graph - No Total Log to console basefolder: ${basefolder} console=True ${resultfolder}= Set Variable ${basefolder}${/}${resultdata} ${resultfile}= Set Variable ${basefolder}${/}${resultdata}${/}${resultdata}.report + ${templatefile}= Set Variable ${basefolder}${/}original_base.template Should Exist ${resultfolder} Log resultfolder: ${resultfolder} console=True Should Not Exist ${resultfile} # pass a default ini file with extended height to ensure that default values are used - Open GUI -d ${resultfolder} -i ${basefolder}${/}RFSwarmReporter.ini + Open GUI -d ${resultfolder} -i ${basefolder}${/}RFSwarmReporter.ini -t ${templatefile} # Run Keyword And Continue On Failure Wait For Status PreviewLoaded 120 Wait For Status PreviewLoaded @@ -249,12 +250,13 @@ Verify Plan Graph - With Total Log to console basefolder: ${basefolder} console=True ${resultfolder}= Set Variable ${basefolder}${/}${resultdata} ${resultfile}= Set Variable ${basefolder}${/}${resultdata}${/}${resultdata}.report + ${templatefile}= Set Variable ${basefolder}${/}original_base.template Should Exist ${resultfolder} Log resultfolder: ${resultfolder} console=True Should Not Exist ${resultfile} # pass a default ini file with extended height to ensure that default values are used - Open GUI -d ${resultfolder} -i ${basefolder}${/}RFSwarmReporter.ini + Open GUI -d ${resultfolder} -i ${basefolder}${/}RFSwarmReporter.ini -t ${templatefile} # Run Keyword And Continue On Failure Wait For Status PreviewLoaded 120 Wait For Status PreviewLoaded @@ -315,12 +317,13 @@ Verify Plan Table Log to console basefolder: ${basefolder} console=True ${resultfolder}= Set Variable ${basefolder}${/}${resultdata} ${resultfile}= Set Variable ${basefolder}${/}${resultdata}${/}${resultdata}.report + ${templatefile}= Set Variable ${basefolder}${/}original_base.template Should Exist ${resultfolder} Log resultfolder: ${resultfolder} console=True Should Not Exist ${resultfile} # pass a default ini file with extended height to ensure that default values are used - Open GUI -d ${resultfolder} -i ${basefolder}${/}RFSwarmReporter.ini + Open GUI -d ${resultfolder} -i ${basefolder}${/}RFSwarmReporter.ini -t ${templatefile} # Run Keyword And Continue On Failure Wait For Status PreviewLoaded 120 Wait For Status PreviewLoaded diff --git a/Tests/Regression/Reporter/testdata/Issue-#140/20230728_130340_Odoo-demo/20230728_130340_Odoo-demo.report b/Tests/Regression/Reporter/testdata/Issue-#140/20230728_130340_Odoo-demo/20230728_130340_Odoo-demo.report deleted file mode 100644 index db84d7139..000000000 --- a/Tests/Regression/Reporter/testdata/Issue-#140/20230728_130340_Odoo-demo/20230728_130340_Odoo-demo.report +++ /dev/null @@ -1,55 +0,0 @@ -[Report] -order = F96CC319A38,F96CC319A3D,F96CC3282EB -title = OCDemo Requests -showtlogo = -1 -dateformat = yyyy-mm-dd -timeformat = HH:MM -timezone = Australia/Brisbane -showstarttime = -1 -showendtime = -1 -font = Verdana -fontsize = 12 -percentile = 90 - -[F96CC319A38] -name = Template -parent = TOP -type = note -changed = 1729040753.6470456 -note = Define your template by adding sections and configuring the section settingsx12Each section can be:x12 - Note (like this) section, free textx12 - Heading, usefull for grouping sectionsx12 - Contents like a table of contents or figuresx12 - Data Table, with data from test resultsx12 - Data Graph, for graphical representation of test resultsx12x12Each section can also have sub sectionsx12x12The cover page and overall report settings can be found on the settings pane of the Report item abovex12 - -[F96CC319A3D] -name = Test Result Summary -parent = TOP -type = table -changed = 1729040757.134148 -colours = 0 -datatype = ResultSummary -sql = SELECT r.result_name as x91Result Namex93 , round(min(rp.elapsed_time),3) 'Minimum', round(avg(rp.elapsed_time),3) 'Average', round(percentile(rp.elapsed_time, 90),3) '90x37ile', round(max(rp.elapsed_time),3) 'Maximum', round(stdev(rp.elapsed_time),3) 'Std. Dev.', count(rp.result) as 'Pass', count(rf.result) as 'Fail', count(ro.result) as 'Other' FROM Results as r LEFT JOIN Results as rp ON r.rowid == rp.rowid AND rp.result == 'PASS' LEFT JOIN Results as rf ON r.rowid == rf.rowid AND rf.result == 'FAIL' LEFT JOIN Results as ro ON r.rowid == ro.rowid AND ro.result <> 'PASS' AND ro.result <> 'FAIL' WHERE r.end_time >= 1690513420 AND r.end_time <= 1690513632 GROUP BY r.result_name ORDER BY x91Result Namex93 - -[F96CC3282EB] -name = Robots -parent = TOP -type = graph -changed = 1729040753.6514955 - -[F96CC3282EBL] -secondarymetric = total_robots -changed = 1729040768.8740733 -filteragent = None -filtertype = None -datatype = Metric -sql = SELECT MetricTime as 'Time' , MetricValue as 'Value' , PrimaryMetric as x91Namex93 FROM MetricData WHERE MetricType == 'Scenario' AND SecondaryMetric == 'total_robots' AND MetricTime >= 1690513420 AND MetricTime <= 1690513632 ORDER BY MetricTime -metrictype = Scenario -axisen = 1 - -[F96CC3282EBR] -datatype = Metric -changed = 1729040768.8795738 -axisen = 0 -metrictype = Agent -filteragent = None -filtertype = None -sql = SELECT MetricTime as 'Time' , MetricValue as 'Value' , PrimaryMetric as x91Namex93 FROM MetricData WHERE MetricType == 'Agent' AND SecondaryMetric == 'Robots' AND MetricTime >= 1690513420 AND MetricTime <= 1690513632 ORDER BY MetricTime -secondarymetric = Robots - diff --git a/Tests/Regression/Reporter/testdata/Issue-#140/RFSwarmReporter.ini b/Tests/Regression/Reporter/testdata/Issue-#140/RFSwarmReporter.ini index f1e3f0dba..467fabfa1 100644 --- a/Tests/Regression/Reporter/testdata/Issue-#140/RFSwarmReporter.ini +++ b/Tests/Regression/Reporter/testdata/Issue-#140/RFSwarmReporter.ini @@ -3,7 +3,7 @@ win_width = 1000 win_height = 600 [Reporter] -template = +template = original_base.template resultdir = templatedir = results = diff --git a/Tests/Regression/Reporter/testdata/Issue-#140/old.template b/Tests/Regression/Reporter/testdata/Issue-#140/original_base.template similarity index 100% rename from Tests/Regression/Reporter/testdata/Issue-#140/old.template rename to Tests/Regression/Reporter/testdata/Issue-#140/original_base.template