Index: adaptors/ega/adaptor.xml =================================================================== --- adaptors/ega/adaptor.xml (revision 604804) +++ adaptors/ega/adaptor.xml (working copy) @@ -46,7 +46,7 @@ - + Index: tests/ega/ega_eclipse_3.2.1.au3 =================================================================== --- tests/ega/ega_eclipse_3.2.1.au3 (revision 604805) +++ tests/ega/ega_eclipse_3.2.1.au3 (working copy) @@ -99,11 +99,8 @@ $run = $java_home & "\bin\java.exe " & $vm_options & " -cp """ & $eclipse_home & "\startup.jar"" -Dosgi.install.area=""" & $eclipse_home & """ org.eclipse.core.launcher.Main -debug > " & $resultsDir & "\eclipse.log 2>&1" ;LogWrite(@TAB & "Command line: " & $run & @LF) Run(@ComSpec & " /c " & $run, "", @SW_HIDE) -LogWrite(@TAB & "wait Eclipse 'Workspace Launcher' window to appear " & @LF) -WinWaitImpl("Workspace Launcher", "", 180) -If Not WinActive("Workspace Launcher") Then WinActivate("Workspace Launcher") -WinWaitActiveImpl("Workspace Launcher", "", 30) -LogWrite(@TAB & "window appeared " & @LF) +SleepImpl(3000) +WinWaitActivateImpl("Workspace Launcher", "", 180) LogWrite(@TAB & "Select " & @WorkingDir & "\workspace as workspace" & @LF) ControlFocus("Workspace Launcher", "", "Edit1") ControlSetText("Workspace Launcher", "", "Edit1", @WorkingDir & "\workspace" ) @@ -1177,7 +1174,9 @@ EndFunc Func WinWaitImpl($wname, $wtext, $wdelay) - Dim $newdelay = 120 + Dim $newdelay = 120*$delay_factor + $wdelay = $wdelay*$delay_factor + LogWrite(@TAB & "Waiting for '" & $wname & "'" & $wtext & " window" & @LF) Dim $wreturn = WinWait($wname, $wtext, $wdelay) If $wreturn=0 Then LogWrite(@TAB & "WARNING! Window '" & $wname & "' didn't appear during " & $wdelay & "c. Add extra delay for " & $newdelay & "c." & @LF) @@ -1191,11 +1190,13 @@ LogWrite(@TAB & "Window '" & $wname & "' appeared in additional time!" & @LF) EndIf EndIf + LogWrite(@TAB & "Window '" & $wname & "' appeared" & @LF) EndFunc - Func WinWaitActiveImpl($wname, $wtext, $wdelay) - Dim $newdelay = 120 + Dim $newdelay = 120 * $delay_factor + $wdelay = $wdelay*$delay_factor + LogWrite(@TAB & "Waiting for '" & $wname & "'" & $wtext & " window activation" & @LF) Dim $wreturn = WinWaitActive($wname, $wtext, $wdelay) If $wreturn=0 Then LogWrite(@TAB & "WARNING! Window '" & $wname & "' didn't become active during " & $wdelay & "c. Add extra delay for " & $newdelay & "c." & @LF) @@ -1209,10 +1210,26 @@ LogWrite(@TAB & "Window '" & $wname & "' became active in additional time!" & @LF) EndIf EndIf + LogWrite(@TAB & "Window '" & $wname & "' is active" & @LF) EndFunc +Func WinWaitActivateImpl($wname, $wtext, $wdelay) + Dim $newdelay = 30 + WinWaitImpl($wname, $wtext, $wdelay) + LogWrite(@TAB & "Activating 'Workspace Launcher' window " & @LF) + + Dim $wreturn = WinActivate($wname, $wtext) + If $wreturn = 0 Then + PrintErrorScreen() + ConsoleWrite(@TAB & "ERROR! An attempt to activate window '" & $wname & "' failed" & @LF) + ExitImpl(1) + EndIf + WinWaitActiveImpl($wname, $wtext, $newdelay) +EndFunc + Func WinWaitCloseImpl($wname, $wtext, $wdelay) - Dim $newdelay = 120 + Dim $newdelay = 120*$delay_factor + $wdelay = $wdelay*$delay_factor LogWrite(@TAB & "Closing window '" & $wname & "'" & @LF) Dim $wreturn = WinWaitClose($wname, $wtext, $wdelay) If $wreturn=0 Then @@ -1223,9 +1240,8 @@ PrintErrorScreen() ConsoleWrite(@LF & "ERROR! Window '" & $wname & "' didn't close during additional " & $newdelay & "c. STOP." & @LF) ExitImpl(1) - Else - LogWrite(@TAB & "Window '" & $wname & "' closed in additional time!" & @LF) EndIf + LogWrite(@TAB & "Window '" & $wname & "' closed in additional time!" & @LF) EndIf EndFunc