2006-09-20 Rodney Dawes <dobey@novell.com>

	* scripts/zen-installer.py: Update to use the python module stuff for
	scanning the program for accessibility issues

3 files changed, 19 insertions, 61 deletions

diff --git a/ChangeLog b/ChangeLog
index c209f31..cbc5a63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-20  Rodney Dawes  <dobey@novell.com>
+
+	* scripts/zen-installer.py: Update to use the python module stuff for
+	scanning the program for accessibility issues
+
 2006-09-18  Rodney Dawes  <dobey@novell.com>
 
 	* scripts/gnome-system-monitor.py: Scan the about box too, now that
diff --git a/scripts/evolution-mail.py b/scripts/evolution-mail.py
deleted file mode 100755
index af86784..0000000
--- a/scripts/evolution-mail.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/python
-
-import string, sys, os
-from ldtp import *
-from ldtputils import *
-from A11yTestUtils import *
-
-program_name = 'evolution'
-window_title = 'Evolution*'
-
-a11y_test_init (program_name)
-
-guiexist (window_title)
-
-a11y_scan_window (window_title)
-
-# Close the main window
-selectmenuitem (window_title, 'mnuFile;mnuQuit')
-
-a11y_test_shutdown ()
-
diff --git a/scripts/zen-installer.py b/scripts/zen-installer.py
index 6dc88d4..793b629 100755
--- a/scripts/zen-installer.py
+++ b/scripts/zen-installer.py
@@ -3,51 +3,25 @@
 import string, sys, os
 from ldtp import *
 from ldtputils import *
-
-os.environ['GTK_MODULES'] = 'gail:atk-bridge'
-os.environ['GNOME_ACCESSIBILITY'] = '1'
+from A11yTestUtils import *
 
 program_name = 'zen-installer'
-window_title = '*Install*'
-
-def __has_label (windowName, componentName):
-    properties = getobjectinfo (windowName, componentName)
-    for prop in properties:
-	if prop == 'label':
-	    return 1
-	elif prop == 'label_by':
-	    return 1
-	continue
-    return 0
-
-def __print_properties (windowName, componentName):
-    properties = getobjectinfo (windowName, componentName)
-    for prop in properties:
-	propValue = getobjectproperty (windowName, componentName, prop)
-	print '\t', prop, ':', propValue
-
-def __check_dialog (windowName, closeButton):
-    objlist = getobjectlist (windowName)
-    has_label = 0
-    for obj in objlist:
-	if hasstate (windowName, obj, state.FOCUSABLE) == 1:
-	    if __has_label (windowName, obj) == 0:
-		print "WARNING:", obj, "has no accessible label defined"
-		__print_properties (windowName, obj)
-    click (windowName, closeButton)
-
-launchapp (program_name, 1)
+window_title = 'Software Installer'
+
+a11y_test_init (program_name)
 
 guiexist (window_title)
 
-objlist = getobjectlist (window_title)
+a11y_scan_window (window_title)
 
-has_label = 0
+click (window_title, 'btnConfigure')
+a11y_scan_window ('frmConfiguration')
+time.sleep (1)
+click ('frmConfiguration', 'btnAddService')
+time.sleep (1)
+#a11y_scan_dialog ('dlgAddService', 'btnCancel')
+click ('frmConfiguration', 'btnClose')
 
-for obj in objlist:
-    if hasstate (window_title, obj, state.FOCUSABLE) == 1:
-	if __has_label (window_title, obj) == 0:
-	    print "WARNING:", obj, "has no accessible label defined"
-	    __print_properties (window_title, obj)
-	
 click (window_title, 'btnClose')
+
+a11y_test_shutdown ()