diff --git a/Tests/Regression/Manager/GUI_Features.robot b/Tests/Regression/Manager/GUI_Features.robot index 9a990f3a0..0ed3dac54 100644 --- a/Tests/Regression/Manager/GUI_Features.robot +++ b/Tests/Regression/Manager/GUI_Features.robot @@ -10,6 +10,45 @@ Suite Setup Set Platform ${scenario_name}= test_scenario *** Test Cases *** +Verify the Field Validation Is Working In the Manager Plan Screen + [Tags] windows-latest ubuntu-latest macos-latest Issue #126 + [Setup] Run Keywords + ... Set INI Window Size 1200 600 AND + ... Set Global Filename And Default Save Path ${robot_data}[0] AND + ... Open Manager GUI AND + ... Create Robot File name=example.robot file_content=***Test Case***\nExample Test Case\n + + @{scenario_names_list}= Create List robots rampup run test script all + &{expected_messages}= Create Dictionary + ... robots=Index 1 has no Robots + ... rampup=Index 1 Ramp Up is < 10 sec + ... run=Index 1 Run is < 10 sec + ... test=Index 1 has no Test + ... script=Index 1 has no Script + ... all=Index 1 has no Robots Index 1 Ramp Up is < 10 sec Index 1 Run is < 10 sec Index 1 has no Script Index 1 has no Test + + FOR ${name} IN @{scenario_names_list} + ${scenarioname}= Set Variable Issue-#126_${name} + ${scenariofile}= Normalize Path ${CURDIR}${/}testdata${/}Issue-#126${/}${scenarioname}.rfs + + Copy File ${scenariofile} ${global_path} + Click Button runopen + Open Scenario File OS DIALOG ${scenario_name} + Press key.enter 1 Times + Click Button runplay + Sleep 2 + ${status}= Run Keyword And Return Status + ... Wait For ${platform}_warning_label_no_${name}.png timeout=${20} + Run Keyword If not ${status} Fail msg=Cant find waring label that says: ${expected_messages}[${name}]. + Press key.enter 1 Times + Delete Scenario File ${scenario_name} + + END + + [Teardown] Run Keywords + ... Delete Robot File ${robot_data}[0] AND + ... Run Keyword Close Manager GUI ${platform} + Verify That Files Get Saved With Correct Extension And Names [Tags] windows-latest ubuntu-latest macos-latest Issue #39 [Setup] Run Keywords @@ -19,7 +58,7 @@ Verify That Files Get Saved With Correct Extension And Names ... Open Agent ${scenario_name}= Set Variable Issue-#39 - Log To Console Files to check: scenario file, csv result files + Log To Console Files to check: scenario file, csv result files. Click Button runsave Save Scenario File OS DIALOG ${scenario_name} diff --git a/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_all.png b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_all.png new file mode 100644 index 000000000..4c9e5e4a0 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_all.png differ diff --git a/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_rampup.png b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_rampup.png new file mode 100644 index 000000000..8a00d0bcf Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_rampup.png differ diff --git a/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_robots.png b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_robots.png new file mode 100644 index 000000000..20b20d0b2 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_robots.png differ diff --git a/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_run.png b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_run.png new file mode 100644 index 000000000..79d5d00ce Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_run.png differ diff --git a/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_script.png b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_script.png new file mode 100644 index 000000000..750a154c9 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_script.png differ diff --git a/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_test.png b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_test.png new file mode 100644 index 000000000..598645323 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/macos_warning_label_no_test.png differ diff --git a/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_all.png b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_all.png new file mode 100644 index 000000000..0fea792f2 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_all.png differ diff --git a/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_rampup.png b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_rampup.png new file mode 100644 index 000000000..1b6f009ab Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_rampup.png differ diff --git a/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_robots.png b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_robots.png new file mode 100644 index 000000000..d6563cfdb Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_robots.png differ diff --git a/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_run.png b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_run.png new file mode 100644 index 000000000..2ae59d0e0 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_run.png differ diff --git a/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_script.png b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_script.png new file mode 100644 index 000000000..521c01e15 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_script.png differ diff --git a/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_test.png b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_test.png new file mode 100644 index 000000000..9de260ff9 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/ubuntu_warning_label_no_test.png differ diff --git a/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_all.png b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_all.png new file mode 100644 index 000000000..79f7dd5cd Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_all.png differ diff --git a/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_rampup.png b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_rampup.png new file mode 100644 index 000000000..6fc03311e Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_rampup.png differ diff --git a/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_robots.png b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_robots.png new file mode 100644 index 000000000..5e89de34c Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_robots.png differ diff --git a/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_run.png b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_run.png new file mode 100644 index 000000000..f0a64128c Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_run.png differ diff --git a/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_script.png b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_script.png new file mode 100644 index 000000000..72e4ed1c0 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_script.png differ diff --git a/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_test.png b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_test.png new file mode 100644 index 000000000..5bdb777b6 Binary files /dev/null and b/Tests/Regression/Manager/Images/file_method/windows_warning_label_no_test.png differ diff --git a/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_all.rfs b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_all.rfs new file mode 100644 index 000000000..6ed86ad13 --- /dev/null +++ b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_all.rfs @@ -0,0 +1,12 @@ +[Scenario] +uploadmode = err +scriptcount = 1 +graphlist = + +[1] +robots = 0 +delay = 0 +rampup = 0 +run = 0 +test = + diff --git a/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_rampup.rfs b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_rampup.rfs new file mode 100644 index 000000000..a3b66c8e0 --- /dev/null +++ b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_rampup.rfs @@ -0,0 +1,13 @@ +[Scenario] +uploadmode = err +scriptcount = 1 +graphlist = + +[1] +robots = 1 +delay = 0 +rampup = 0 +run = 10 +test = Example Test Case +script = example.robot + diff --git a/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_robots.rfs b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_robots.rfs new file mode 100644 index 000000000..47fc1512f --- /dev/null +++ b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_robots.rfs @@ -0,0 +1,13 @@ +[Scenario] +uploadmode = err +scriptcount = 1 +graphlist = + +[1] +robots = 0 +delay = 0 +rampup = 10 +run = 10 +test = Example Test Case +script = example.robot + diff --git a/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_run.rfs b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_run.rfs new file mode 100644 index 000000000..419cf81bc --- /dev/null +++ b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_run.rfs @@ -0,0 +1,13 @@ +[Scenario] +uploadmode = err +scriptcount = 1 +graphlist = + +[1] +robots = 1 +delay = 0 +rampup = 10 +run = 0 +test = Example Test Case +script = example.robot + diff --git a/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_script.rfs b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_script.rfs new file mode 100644 index 000000000..e9e5a74b4 --- /dev/null +++ b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_script.rfs @@ -0,0 +1,12 @@ +[Scenario] +uploadmode = err +scriptcount = 1 +graphlist = + +[1] +robots = 1 +delay = 0 +rampup = 10 +run = 10 +test = test + diff --git a/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_test.rfs b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_test.rfs new file mode 100644 index 000000000..8c4bd84e8 --- /dev/null +++ b/Tests/Regression/Manager/testdata/Issue-#126/Issue-#126_test.rfs @@ -0,0 +1,12 @@ +[Scenario] +uploadmode = err +scriptcount = 1 +graphlist = + +[1] +robots = 1 +delay = 0 +rampup = 10 +run = 10 +test = +script = example.robot diff --git a/rfswarm_manager/rfswarm.py b/rfswarm_manager/rfswarm.py index ebe2a1f88..5dc1d5e91 100644 --- a/rfswarm_manager/rfswarm.py +++ b/rfswarm_manager/rfswarm.py @@ -3189,7 +3189,7 @@ def Pre_Run_Checks(self, _event=None): base.debugmsg(5, "grp", grp) if "Index" in grp.keys(): if "Robots" not in grp.keys() or grp["Robots"] < 1: - warnings.append("Index {} has no Robots".format(grp["Index"])) + warnings.append("Index {} has no Robots.".format(grp["Index"])) # RampUp < 10 if "RampUp" not in grp.keys() or grp["RampUp"] < 10: @@ -3199,14 +3199,14 @@ def Pre_Run_Checks(self, _event=None): warnings.append("Index {} Run is < 10 sec.".format(grp["Index"])) if "Script" not in grp.keys() or len(grp["Script"]) < 1: - warnings.append("Index {} has no Script".format(grp["Index"])) + warnings.append("Index {} has no Script.".format(grp["Index"])) else: # ScriptHash if "ScriptHash" not in grp.keys() or len(grp["ScriptHash"]) < 1: - warnings.append("Index {} Agents don't have Script yet".format(grp["Index"])) + warnings.append("Index {} Agents don't have Script yet.".format(grp["Index"])) if "Test" not in grp.keys() or len(grp["Test"]) < 1: - warnings.append("Index {} has no Test".format(grp["Index"])) + warnings.append("Index {} has no Test.".format(grp["Index"])) # warnings.append("Debuging : Don't Run") return warnings