Test fixes

eclipse · Mar 19, 2024 · 815304a · 815304a
1 parent 1423b3c
commit 815304a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/q7commands/TakeScreenshot.test b/rcpttTests/ECL_IDE_module/selfAUTTests/q7commands/TakeScreenshot.test
@@ -71,11 +71,17 @@ with [get-window "Execution details"] {
         get-property activePage | equals Screenshots | verify-true
         get-property tabCount | equals 2 | verify-true
     }
-    get-label "Screenshot 1 from 2" | get-property caption | equals "Screenshot 1 from 2" | verify-true
+    get-label "Screenshot 1 from 5" | get-property caption | equals "Screenshot 1 from 5" | verify-true
+}
+with [get-window "Execution details" | get-button Next]{
+
+    click
+    click
+    click
+    click
 }
-get-window "Execution details" | get-button Next | click
 with [get-window "Execution details"] {
-    get-label "Screenshot 2 from 2" | get-property caption | equals "Screenshot 2 from 2" | verify-true
+    get-label "Screenshot 5 from 5" | get-property caption | equals "Screenshot 5 from 5" | verify-true
     get-button Next | get-property enablement | equals false | verify-true
     get-button Previous | get-property enablement | equals true | verify-true
 }

diff --git a/rcpttTests/platform_tests/Recording/EclipseForms/FormToolkitRecording.test b/rcpttTests/platform_tests/Recording/EclipseForms/FormToolkitRecording.test
@@ -42,7 +42,9 @@ get-aut "mockupsQ7" | eval {
             click -metaKeys SHIFT
             click -metaKeys 393216
 	    }
-        get-tree | select "node 4/node 4 - 3"
+        try -times 10 -delay 1000 -command{
+		get-tree | select "node 4/node 4 - 3"
+	}
         get-label "Label for mouse clicking test" | click
 	}
 	get-label "Label \"Label for mouse clicking test\" clicked. MouseButton: 1. StateMask: 0"

diff --git a/...selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test b/...selfAUTTests/RCPTT-478_HTML report looks different if it is copied as only html-file.test
@@ -37,6 +37,14 @@ Verify that report styles are not broken.
 Content-Type: text/ecl
 Entry-Name: .content
 
+get-preferences-menu | click
+with [get-window Preferences] {
+    get-tree | select "General/Web Browser"
+    get-button "Use internal web browser" | click -metaKeys ""
+    get-button Apply | click -metaKeys ""
+    get-button "Apply and Close" | click -metaKeys ""
+}
+
 get-view "Test Explorer" | get-tree | select "Q7Project/test1" | select "Q7Project/test1" | double-click
 get-editor test1 | get-button Replay | click
 get-view "Execution View" | get-button Report | click
@@ -52,17 +60,17 @@ with [get-window "New Folder"] {
 }
 get-view "Test Explorer" | get-tree | select "Q7Project/test1.*.html" | double-click
 
-let [val reportContent [get-editor [get-by-os -macosx ".*.html" -win ".*.html" -linux "Web Browser"] | get-control Browser | get-property text -raw]]{
+let [val reportContent [get-editor [get-by-os -macosx ".*.html" -win ".*.html" -linux ".*.html"] | get-control Browser | get-property text -raw]]{
 
-	get-editor [get-by-os -macosx ".*.html" -win ".*.html" -linux "Web Browser"] | close
+	get-editor [get-by-os -macosx ".*.html" -win ".*.html" -linux ".*.html"] | close
 
 	with [get-view "Test Explorer" | get-tree] {
 	    select "Q7Project/test1.*.html" | get-menu Copy | click
 	    select "Q7Project/F" | select "Q7Project/F" | get-menu Paste | click
 	    select "Q7Project/F/test1.*.html" | double-click
 	}
 
-	get-editor [get-by-os -macosx ".*.html" -win ".*.html" -linux "Web Browser"] | get-control Browser | get-property text -raw | eq $reportContent | verify-true   
+	get-editor [get-by-os -macosx ".*.html" -win ".*.html" -linux ".*.html"] | get-control Browser | get-property text -raw | eq $reportContent | verify-true   
 
 }