dogtail-tests r16 - in trunk: appwrappers/dogtail/appwrappers gedit

[zcerza svn gnome org]

Author: zcerza
Date: Mon Jan 21 16:56:47 2008
New Revision: 16
URL: http://svn.gnome.org/viewvc/dogtail-tests?rev=16&view=rev

Log:
Port the gedit wrapper to dogtail svn.


Modified:
   trunk/appwrappers/dogtail/appwrappers/gedit.py
   trunk/gedit/gedit-saving-tests.py

Modified: trunk/appwrappers/dogtail/appwrappers/gedit.py
==============================================================================
--- trunk/appwrappers/dogtail/appwrappers/gedit.py	(original)
+++ trunk/appwrappers/dogtail/appwrappers/gedit.py	Mon Jan 21 16:56:47 2008
@@ -1,6 +1,6 @@
-import dogtail.tree
+from dogtail.wrapped import Application
 
-class Gedit(dogtail.tree.Application):
+class Gedit(Application):
     def setText(self, text):
         buf = self.child(roleName = 'text')
         buf.text = text
@@ -9,19 +9,22 @@
         return self.child(roleName='text').text
 
     def openLocation(self, uri):
-        menuItem = self.menu("File").menuItem("Open Location...")
-        menuItem.click()
+        menu = self.menu("File")
+        menu.click()
+        menu.menuItem("Open Location...").click()
         dlg = self.dialog('Open Location')
         dlg.child(roleName = 'text').text = uri
         dlg.button('Open').click()
 
     def saveAs(self, uri):
-        menuItem = self.menu("File").menuItem("Save As...")
-        menuItem.click()
+        menu = self.menu("File")
+        menu.click()
+        menu.menuItem("Save As...").click()
         dlg = self.dialog('Save As...')
         dlg.child(roleName = 'text').text = uri
         dlg.button('Save').click()
 
     def printPreview(self):
-        menuItem = self.menu("File").menuItem("Print Preview")
-        menuItem.click()
+        menu = self.menu("File")
+        menu.click()
+        menu.menuItem("Print Preview")

Modified: trunk/gedit/gedit-saving-tests.py
==============================================================================
--- trunk/gedit/gedit-saving-tests.py	(original)
+++ trunk/gedit/gedit-saving-tests.py	Mon Jan 21 16:56:47 2008
@@ -7,8 +7,9 @@
 
 import unittest
 
-from dogtail.tree import *
-from dogtail.appwrappers.gedit import *
+import dogtail.tree
+try: from dogtail.appwrappers.gedit import Gedit
+except ImportError: from appwrappers.gedit import Gedit
 from dogtail.utils import run
 
 import os.path
@@ -23,8 +24,11 @@
     gedit = Gedit(dogtail.tree.root.application('gedit'))
     gedit.openLocation(makeGnomeVfsUri(filePath))
     gedit.setText('bar')
-    gedit.menu('File').menuItem('Save').click()
-    gedit.menu('File').menuItem('Quit').click()
+    menu = gedit.menu('File')
+    menu.click()
+    menu.menuItem('Save').click()
+    menu.click()
+    menu.menuItem('Quit').click()
 
 def createTestFile(filePath):
     # Create test file