Cleaned up the dogtail scripts.

2006-10-29  Wouter Bolsterlee  <wbolster@cvs.gnome.org>

	* test/test1.py:
	* test/test2.py:

	Cleaned up the dogtail scripts.

2 files changed, 26 insertions, 19 deletions

diff --git a/test/test1.py b/test/test1.py
index 8c05ebd..d3abed3 100755
--- a/test/test1.py
+++ b/test/test1.py
@@ -1,27 +1,32 @@
 #!/usr/bin/python
 
-from dogtail.procedural import *
-from dogtail.utils import screenshot
-
-import os
+# This test opens the interface and just clicks around a bit.
 
-os.environ['LANG']='en_US.UTF-8'
-os.system ('rm -rf ~/.gnome2/evince')
+from dogtail.procedural import *
 
 run('evince')
 
-focus.application('evince')
-
+# Test file->open
 click('File', roleName='menu')
 click('Open...', roleName='menu item')
 focus.dialog('Open Document')
 click('Cancel', roleName='push button')
-click('File', roleName='menu')
+
+# Toolbar editor
+click('Edit', roleName='menu')
 click('Toolbar', roleName='menu item')
 focus.dialog('Toolbar Editor')
 click('Close', roleName='push button')
+
+# About dialog
+click('Help', roleName='menu')
 click('About', roleName='menu item')
 focus.dialog('About Evince')
+click('Credits', roleName='push button')
+focus.dialog('Credits')
+click('Close', roleName='push button')
 click('Close', roleName='push button')
-click('Close', roleName='menu item')
 
+# Close evince
+click('File', roleName='menu')
+click('Close', roleName='menu item')
diff --git a/test/test2.py b/test/test2.py
index 7e52c57..c0958c8 100755
--- a/test/test2.py
+++ b/test/test2.py
@@ -1,22 +1,24 @@
 #!/usr/bin/python
 
-from dogtail.procedural import *
-from dogtail.utils import screenshot
+# This test opens a password encrypted file and tries to unlock it.
 
-import os
+from dogtail.procedural import *
 
-os.environ['LANG']='en_US.UTF-8'
-os.system ('rm -rf ~/.gnome2/evince')
+run('evince', arguments=' ./test-encrypt.pdf',)
 
-run('evince',arguments=' ./test-encrypt.pdf',)
+# Try an incorrect password first
 focus.dialog('Enter password')
 focus.widget('Password Entry', roleName='password text')
-type("wrong password")
+type('wrong password')
 click('OK', roleName='push button')
 click('Cancel', roleName='push button')
+
+# Try again with the correct password
 click('Unlock Document', roleName='push button')
 focus.widget('Password Entry', roleName='password text')
-type("Foo")
+type('Foo')
 click('OK', roleName='push button')
-click('Close', roleName='menu item')
 
+# Close evince
+click('File', roleName='menu')
+click('Close', roleName='menu item')