Full test for Issue 52 and 53

NiceProjectPoland · Apr 14, 2024 · da67ea3 · da67ea3
1 parent a365238
commit da67ea3
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 13 deletions.
diff --git a/Tests/Regression/Manager/GUI_Common.robot b/Tests/Regression/Manager/GUI_Common.robot
@@ -102,13 +102,28 @@ Stop Agent
 	# Should Be Equal As Integers 	${result.rc} 	0
 
 Stop Agent Robots Gradually
+	[Arguments]	${rumup_time}	${expected_robot_test_time}
+	Sleep	${rumup_time + 10}
+	Click Button	stoprun
+	Press Key.tab 1 Times
+	Move To	10	10
+	Wait For	manager_${platform}_button_finished_run.png	timeout=${expected_robot_test_time + 10}
+	${status}=	Run Keyword And Return Status	Wait For	manager_${platform}_robots_0.png	timeout=20
+	Take A Screenshot
+	Run Keyword If	not ${status}	Fail	msg=Robots are not zero. Check screenshots for more informations.
+
+Stop Agent With Terminate Signal
 	[Arguments]	${rumup_time}
-	Sleep	${rumup_time}
+	Sleep	${rumup_time + 10}
 	Click Button	stoprun
+	Sleep	2
+	Click
+	Press Key.enter 1 Times
 	Press Key.tab 1 Times
 	Move To	10	10
-	Wait For	manager_${platform}_button_finished_run.png	timeout=120
-	${status}=	Run Keyword And Return Status	Locate	manager_${platform}_robots_0.png
+	Wait For	manager_${platform}_button_finished_run.png	timeout=50
+	${status}=	Run Keyword And Return Status	Wait For	manager_${platform}_robots_0.png	timeout=50
+	Take A Screenshot
 	Run Keyword If	not ${status}	Fail	msg=Robots are not zero. Check screenshots for more informations.
 
 Check If The Agent Has Connected To The Manager
@@ -352,9 +367,9 @@ Change ${str1} With ${str2} In ${file}
 	Create File		${file}	${file_content}
 
 Select Robot File
-	[Arguments]		@{robot_data}
+	[Arguments]		${robot_file_name}
 	Sleep	2
-	${robot_file_name}=		Set Variable		${robot_data}[1]
+	${robot_file_name}=		Set Variable		${robot_file_name}
 	${robot_file_name}=		Get Substring	${robot_file_name}	0	-6
 	Log		${robot_file_name}
 	Take A Screenshot

diff --git a/Tests/Regression/Manager/GUI_Features.robot b/Tests/Regression/Manager/GUI_Features.robot
@@ -8,7 +8,7 @@ Suite Setup 	Set Platform
 *** Variables ***
 @{run_robots}
 @{run_times_in_s}	#delay,		rump-up,	time
-@{robot_data}=	Example Test Case	example.robot
+@{robot_data}=	example.robot	Example Test Case
 &{row_settings_data}=	
 ...    excludelibraries=builtin,string,operatingsystem,perftest,collections	
 ...    robot_options=-v var:examplevariable	
@@ -45,7 +45,7 @@ Insert Example Data To Manager
 		END
 		Press Key.tab 2 Times
 		Click Button	selected_runscriptrow
-		Select Robot File	@{robot_data}
+		Select Robot File	${robot_data}[0]
 		Click Button	selected_select_test_case
 		Click Button	select_example
 		Press Key.tab 2 Times
@@ -202,7 +202,7 @@ Verify If Agent Copies Every File From Manager. FORMAT: '.{/}dir1{/}'
 	Click Button	runopen
 	Open Scenario File	test_scenario
 	Check If The Agent Has Connected To The Manager
-	Sleep	10
+	Sleep	15
 
 	@{excluded_files}=	Create List	RFSListener3.py	RFSTestRepeater.py
 	${A_absolute_paths}	${A_file_names}	
@@ -243,7 +243,7 @@ Verify If Agent Copies Every File From Manager. FORMAT: '{CURDIR}{/}dir1{/}'
 	Click Button	runopen
 	Open Scenario File	test_scenario
 	Check If The Agent Has Connected To The Manager
-	Sleep	10
+	Sleep	15
 
 	@{excluded_files}=	Create List	RFSListener3.py	RFSTestRepeater.py
 	${A_absolute_paths}	${A_file_names}	
@@ -284,7 +284,7 @@ Verify If Agent Copies Every File From Manager. FORMAT: 'dir1{/}'
 	Click Button	runopen
 	Open Scenario File	test_scenario
 	Check If The Agent Has Connected To The Manager
-	Sleep	10
+	Sleep	15
 
 	@{excluded_files}=	Create List	RFSListener3.py	RFSTestRepeater.py
 	${A_absolute_paths}	${A_file_names}	

diff --git a/Tests/Regression/Manager/testdata/Issue-52/example/dir4/example.txt b/Tests/Regression/Manager/testdata/Issue-52/example/dir4/example.txt
@@ -0,0 +1 @@
+i am just example txt file
diff --git a/Tests/Regression/Manager/testdata/Issue-52/example/dir4/example_pdf.pdf b/Tests/Regression/Manager/testdata/Issue-52/example/dir4/example_pdf.pdf
diff --git a/Tests/Regression/Manager/testdata/Issue-52/example/dir4/example_web.html b/Tests/Regression/Manager/testdata/Issue-52/example/dir4/example_web.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Example HTML Page</title>
+</head>
+<body>
+    <h1>Welcome to My Website</h1>
+    <p>This is a paragraph on my website.</p>
+</body>
+</html>
diff --git a/Tests/Regression/Manager/testdata/Issue-52/example/excel_example.xlsx b/Tests/Regression/Manager/testdata/Issue-52/example/excel_example.xlsx
diff --git a/...er/testdata/Issue-52/example/main/dir1/dir2/dir3/manager_macos_agents_ready.jpg b/...er/testdata/Issue-52/example/main/dir1/dir2/dir3/manager_macos_agents_ready.jpg
diff --git a/...r/testdata/Issue-52/example/main/dir1/dir2/dir3/manager_ubuntu_agents_ready.jpg b/...r/testdata/Issue-52/example/main/dir1/dir2/dir3/manager_ubuntu_agents_ready.jpg
diff --git a/.../testdata/Issue-52/example/main/dir1/dir2/dir3/manager_windows_agents_ready.jpg b/.../testdata/Issue-52/example/main/dir1/dir2/dir3/manager_windows_agents_ready.jpg
diff --git a/Tests/Regression/Manager/testdata/Issue-52/main1.robot b/Tests/Regression/Manager/testdata/Issue-52/main1.robot
@@ -10,8 +10,11 @@ Variables	.${/}dir1${/}vars.py
 Variables	.${/}..${/}vars0.py
 
 Library 	OperatingSystem
-Metadata	File	.${/}dir1${/}manager_windows_agents_ready.jpg
+Metadata	File	.${/}dir1${/}manager_windows_agents_ready.png
 Metadata	File	.${/}dir1${/}dir2${/}example.csv
+Metadata	File	.${/}dir1${/}dir2${/}dir3${/}*.jpg
+Metadata	File	.${/}..${/}dir4${/}*.*
+Metadata	File	.${/}..${/}excel_example.xlsx
 
 *** Test Cases ***
 0 Test Resource Files Keywords

diff --git a/Tests/Regression/Manager/testdata/Issue-52/main2.robot b/Tests/Regression/Manager/testdata/Issue-52/main2.robot
@@ -10,8 +10,11 @@ Variables	${CURDIR}${/}dir1${/}vars.py
 Variables	${CURDIR}${/}..${/}vars0.py
 
 Library 	OperatingSystem
-Metadata	File	${CURDIR}${/}dir1${/}manager_windows_agents_ready.jpg
+Metadata	File	${CURDIR}${/}dir1${/}manager_windows_agents_ready.png
 Metadata	File	${CURDIR}${/}dir1${/}dir2${/}example.csv
+Metadata	File	${CURDIR}${/}dir1${/}dir2${/}dir3${/}*.jpg
+Metadata	File	${CURDIR}${/}..${/}dir4${/}*.*
+Metadata	File	${CURDIR}${/}..${/}excel_example.xlsx
 
 *** Test Cases ***
 0 Test Resource Files Keywords

diff --git a/Tests/Regression/Manager/testdata/Issue-52/main3.robot b/Tests/Regression/Manager/testdata/Issue-52/main3.robot
@@ -10,8 +10,11 @@ Variables	dir1${/}vars.py
 Variables	..${/}vars0.py
 
 Library 	OperatingSystem
-Metadata	File	dir1${/}manager_windows_agents_ready.jpg
+Metadata	File	dir1${/}manager_windows_agents_ready.png
 Metadata	File	dir1${/}dir2${/}example.csv
+Metadata	File	dir1${/}dir2${/}dir3${/}*.jpg
+Metadata	File	..${/}dir4${/}*.*
+Metadata	File	..${/}excel_example.xlsx
 
 *** Test Cases ***
 0 Test Resource Files Keywords