[cxtest-cvs] Peter Nociar : Fixed tests for Quicken 2k3,2k4,2k5.

[Jozef Stefanka]

Module: cxtest
Branch: master
Commit: a64a1262e521eeced4f7b4421ff74eeca6f5e6fe
URL:    http://foghorn.codeweavers.com/git/cxtest/cxtest.git/?a=commit;h=a64a1262e521eeced4f7b4421ff74eeca6f5e6fe

Author: Peter Nociar <peter.nociar at ifne.eu>
Date:   Thu Jan  3 13:43:03 2008 +0100

Fixed tests for Quicken 2k3,2k4,2k5.

Set some clicks to --nofail because few window doesn't show up anymore on linux.
Delete old commented code.

---

 packages/quicken2k3/install/quicken2k3.sh |   12 ++++--------
 packages/quicken2k4/install/quicken2k4.sh |   19 +++++--------------
 packages/quicken2k5/install/quicken2k5.sh |    7 +++----
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/packages/quicken2k3/install/quicken2k3.sh b/packages/quicken2k3/install/quicken2k3.sh
index 47f1c30..35bd776 100755
--- a/packages/quicken2k3/install/quicken2k3.sh
+++ b/packages/quicken2k3/install/quicken2k3.sh
@@ -66,18 +66,14 @@ then
       --winclass "#32770" --wintitle "Information" \
       --ctrlclass "Button" --ctrlcaption "&OK" --ctrlid 1
 fi      
-#send_click --winewindow button1 --timeout 80000 --position 37x11 \
-#    --winclass "#32770" --wintitle "Installation Complete" \
-#    --ctrlclass "Button" --ctrlcaption "Finish" --ctrlid 1 --delay 45 --allow-disabled
-#delay 20
-send_click find --window "Installation Complete"
+
 send_click --winewindow button1 --position 37x11 \
     --winclass "#32770" --wintitle "Installation Complete" \
-    --ctrlclass "Button" --ctrlcaption "Finish" --ctrlid 1 --delay 45
-#send_click lclick --window "C:\PROG~FBU\COMM~CP1\INST~JM1\DRIVER\7\INTE~MEX\IDRIVER.EXE -Embedding" --position 512x462 --timeout 10000 --nofail
+    --ctrlclass "Button" --ctrlcaption "Finish" --ctrlid 1 --timeout 10000 --nofail
+
 send_click --winewindow button1 --position 47x10 \
     --winclass "QWinDlg" --wintitle "Get Started with Quicken 2003" \
-    --ctrlclass "QC_button" --ctrlcaption "Exit &Quicken" --ctrlid 32766
+    --ctrlclass "QC_button" --ctrlcaption "Exit &Quicken" --ctrlid 32766  --timeout 10000 --nofail
     
 cxsetup_exit
 
diff --git a/packages/quicken2k4/install/quicken2k4.sh b/packages/quicken2k4/install/quicken2k4.sh
index b9bcb81..bc2d758 100755
--- a/packages/quicken2k4/install/quicken2k4.sh
+++ b/packages/quicken2k4/install/quicken2k4.sh
@@ -61,22 +61,13 @@ send_click --winewindow button1 --position 21x15 \
 send_click --winewindow button1 --position 26x9 \
     --winclass "#32770" --wintitle "Information" \
     --ctrlclass "Button" --ctrlcaption "&OK"
-#send_click --winewindow button1 --timeout 84000 --position 48x9 \
-#    --winclass "#32770" --wintitle "Quicken 2004 Installation" \
-#    --ctrlclass "Button" --ctrlcaption "&Next >"
-#send_click --winewindow button1 --timeout 10000 --position 36x13 \
-#    --winclass "#32770" --wintitle "Quicken 2004 Installation" \
-#    --ctrlclass "Button" --ctrlcaption "&No"
-#send_click --winewindow button1 --timeout 12000 --position 35x15 \
-#    --winclass "#32770" --wintitle "Exit Setup" \
-#    --ctrlclass "Button" --ctrlcaption "&Yes"
-delay 10
-#send_click lclick --window "Installation Complete" --position 184x186
-send_click lclick --window "Installation Complete" --position 210x166
+
+
+send_click lclick --window "Installation Complete" --position 210x166 --timeout 10000 --nofail
+
 send_click --winewindow button1 --position 35x15 \
     --winclass "#32770" --wintitle "Installation Complete" \
-    --ctrlclass "Button" --ctrlcaption "Finish" --ctrlid 1
-
+    --ctrlclass "Button" --ctrlcaption "Finish" --ctrlid 1 --timeout 10000 --nofail
 cxsetup_exit
 
 exit 0
diff --git a/packages/quicken2k5/install/quicken2k5.sh b/packages/quicken2k5/install/quicken2k5.sh
index 4c61563..118099f 100755
--- a/packages/quicken2k5/install/quicken2k5.sh
+++ b/packages/quicken2k5/install/quicken2k5.sh
@@ -83,16 +83,15 @@ send_click find --window "Information"
 send_click --winewindow button1 --position 36x21 \
     --winclass "#32770" --wintitle "Information" \
     --ctrlclass "Button" --ctrlcaption "&OK" --ctrlid 1
-send_click find --window "InstallShield Wizard"
 send_click --winewindow button1 --position 52x19 \
     --winclass "#32770" --wintitle "InstallShield Wizard" \
-    --ctrlclass "Button" --ctrlcaption "Finish" --ctrlid 1 --delay 45
+    --ctrlclass "Button" --ctrlcaption "Finish" --ctrlid 1 --delay 45 --timeout 10000 --nofail
 send_click --winewindow button1 --position 41x12 \
     --winclass "#32770" --wintitle "Quicken Update" \
-    --ctrlclass "QC_button" --ctrlcaption "&Cancel" --ctrlid 2
+    --ctrlclass "QC_button" --ctrlcaption "&Cancel" --ctrlid 2 --timeout 10000 --nofail
 send_click --winewindow button1 --position 69x12 \
     --winclass "QWinDlg" --wintitle "Get Started with Quicken 2005" \
-    --ctrlclass "QC_button" --ctrlcaption "Exit &Quicken"
+    --ctrlclass "QC_button" --ctrlcaption "Exit &Quicken" --timeout 10000 --nofail
     
 cxsetup_exit