Merge lp:~carla-sella/ubuntu-autopilot-tests/evince-mod into lp:ubuntu-autopilot-tests

[Carla Sella]

For Nicholas:
- I cancelled TABS
- In the Evince test I put back the home global variable otherwise test does not work (do not know if this is ok for you) - fixed the assertions in the "enter_fullscreen_mode" and "exit_fullscreen_mode", I think thats ok for those two tests.

I proposed for merging so you can see if the changes are ok for you.

=== modified file 'evince/test_evince.py'
--- evince/test_evince.py	2013-01-03 23:38:02 +0000
+++ evince/test_evince.py	2013-01-06 15:13:23 +0000
@@ -11,6 +11,10 @@
 
 #http://packages.qa.ubuntu.com/qatracker/testcases/1417/info
 class EvinceTests(AutopilotTestCase):
+
+    global home
+    home = os.getenv('HOME')
+
     def setUp(self):
         super(EvinceTests, self).setUp()
         self.app = self.start_app_window("Document Viewer")
@@ -44,38 +48,40 @@
         sleep(2)
 
         #Does Evince enter fullscreen mode?
-        if self.app.is_maximized:
-            print "maxed"
-        print str(self.app.geometry())
+        windowState = self.app._get_window_states()
+        self.assertThat(windowState, Contains("_NET_WM_STATE_FULLSCREEN"))
+        
 
     def test_exit_fullscreen_mode(self):
         #Test-case name: evince/evn-003
         #This test will check that Evince can enter exit fullscreen mode via F11
-        #Create pdf
-        createFile(self)
 
-        #Open pdf
-        openFile(self)
+        #Press F11
+        self.keyboard.press_and_release("F11")
+        sleep(2)
 
         #Make sure that Evince is in fullscreen mode
+        windowState = self.app._get_window_states()
+        self.assertThat(windowState, Contains("_NET_WM_STATE_FULLSCREEN"))
 
         #Exit  fullscreen mode
         self.keyboard.press_and_release("F11")
         sleep(2)
 
         #Does Evince exit fullscreen mode and restore the window size and position correctly?
-        #Delete pdf
-        deleteFile(self)
+        windowState = self.app._get_window_states()
+        self.assertNotIn(windowState, Contains("_NET_WM_STATE_FULLSCREEN"))
+
 
     def test_hide_side_bar(self):
         #Test-case name: evince/evn-004
         #This test will check that Evince can hide sidebar
         #Create pdf
         createFile(self)
-
         #Open pdf
         openFile(self)
-
+        sleep(5)
+        
         #Make sure sidebar is displayed
 
         #Press F9
@@ -94,12 +100,15 @@
         createFile(self)
         #Open pdf
         openFile(self)
+        sleep(5)
         #Make sure sidebar is hidden
 
         #Press F9
         self.keyboard.press_and_release("F9")
         sleep(2)
+
         #Does Evince display a sidebar with page thumbnails or the document index?
+        
 
         #Delete pdf
         deleteFile(self)
@@ -111,6 +120,7 @@
         createFile(self)
         #Open pdf
         openFile(self)
+        sleep(5)
         #Press ctrl+left
         self.keyboard.press_and_release("Ctrl+Left")
         sleep(2)
@@ -139,9 +149,9 @@
 def openFile(self):
     #Open a pdf by selecting file
     self.keyboard.press_and_release("Ctrl+o")
-    self.keyboard.type("~/Documents/output.pdf")
+    self.keyboard.type(home + "/Documents/output.pdf")
     self.keyboard.type("\n")
 
 def deleteFile(self):
     #Delete pdf file created for test purposes
-    self.addCleanup("~/Documents/output.pdf")
+    self.addCleanup(remove, home + "/Documents/output.pdf")

=== modified file 'gedit/test_gedit.py'
--- gedit/test_gedit.py	2012-12-28 15:41:41 +0000
+++ gedit/test_gedit.py	2013-01-06 15:13:23 +0000
@@ -94,15 +94,15 @@
         self.keyboard.type("firefox /tmp/gedit.html\n")
         
         #Close firefox window
-	sleep(1)
-	self.keyboard.press_and_release("Ctrl+q")
+        sleep(1)
+        self.keyboard.press_and_release("Ctrl+q")
 
         #Close terminal window
         #self.keyboard.press_and_release("Alt+Tab")
         self.keyboard.type("exit\n")
        
         #Remove "/tmp/gedit.html" file
-	sleep(3)
+        sleep(3)
         self.addCleanup(remove, "/tmp/gedit.html") 
  
 
@@ -165,7 +165,7 @@
 
         #Type in "T"
         self.keyboard.type("T")
-	sleep(5)
+        sleep(5)
 
         #Verify all the "T" letters in the document are highlited
     
@@ -197,8 +197,8 @@
         #Delete the file we made
         sleep(3)
         self.addCleanup(remove, tempFile.name)   
-  
-  
+
+
     def test_display_file_browser_panel(self):
         #Test-case name: gedit/ged-005
         #This test will check that GEdit can display File Browser panel

=== modified file 'screenshot/test_screenshot.py'
--- screenshot/test_screenshot.py	2013-01-03 23:38:02 +0000
+++ screenshot/test_screenshot.py	2013-01-06 15:13:23 +0000
@@ -36,7 +36,7 @@
         sleep(3)
 
         #Make sure screenshot window you launched is focused and ready to accept your keyboard input
-  	  	self.app.set_focus()
+        self.app.set_focus()
         self.assertTrue(self.app.is_focused)
 
         #Press Alt+n to focus on Name field
@@ -62,7 +62,7 @@
         self.keyboard.press_and_release("Alt+w")
 
         #Make sure screenshot window you launched is focused and ready to accept your keyboard input
-  	  	self.app.set_focus()
+        self.app.set_focus()
         self.assertTrue(self.app.is_focused)
 
         #Press Alt+n to focus on Name field
@@ -97,7 +97,7 @@
         self.keyboard.press_and_release("Alt+s")
 
         #Make sure screenshot window you launched is focused and ready to accept your keyboard input
-  	  	self.app.set_focus()
+        self.app.set_focus()
         self.assertTrue(self.app.is_focused)
 
         #Press Alt+n to focus on Name field
@@ -108,5 +108,5 @@
 
         #Is the screenshot image saved to your home directory? Is it a valid image file containing your selected window, with the drop shadow effect?
 
-      	#Remove created file
+        #Remove created file
         self.addCleanup(remove, "/tmp/shot2.png")

=== modified file 'terminal/test_terminal.py'
--- terminal/test_terminal.py	2012-12-28 14:02:50 +0000
+++ terminal/test_terminal.py	2013-01-06 15:13:23 +0000
@@ -99,23 +99,23 @@
         self.keyboard.press_and_release("Down")
         self.keyboard.press_and_release("Down")
         self.keyboard.press_and_release("Down")
-	self.keyboard.type("\n") 
+        self.keyboard.type("\n") 
         self.keyboard.press_and_release("Alt+s")
-	self.keyboard.press_and_release("Shift+Tab")
-	self.keyboard.press_and_release("Shift+Tab")
-	self.keyboard.type("\n")
+        self.keyboard.press_and_release("Shift+Tab")
+        self.keyboard.press_and_release("Shift+Tab")
+        self.keyboard.type("\n")
 
         #Set a Background Image
-      	self.keyboard.press_and_release("Shift+Tab")
-	self.keyboard.press_and_release("Right")
-	self.keyboard.press_and_release("Alt+b")
-	self.keyboard.press_and_release("Alt+f")
-	self.keyboard.press_and_release("Space")
-	self.keyboard.type("/usr/share/backgrounds/Gran_Canaria_by_ALF.jpg")
-	self.keyboard.press_and_release("Alt+o")
-	self.keyboard.press_and_release("Tab")
-	self.keyboard.press_and_release("Tab")
-	self.keyboard.press_and_release("Space")
+        self.keyboard.press_and_release("Shift+Tab")
+        self.keyboard.press_and_release("Right")
+        self.keyboard.press_and_release("Alt+b")
+        self.keyboard.press_and_release("Alt+f")
+        self.keyboard.press_and_release("Space")
+        self.keyboard.type("/usr/share/backgrounds/Gran_Canaria_by_ALF.jpg")
+        self.keyboard.press_and_release("Alt+o")
+        self.keyboard.press_and_release("Tab")
+        self.keyboard.press_and_release("Tab")
+        self.keyboard.press_and_release("Space")
 
         #Verify Terminal background changes
 
@@ -125,21 +125,21 @@
 	self.keyboard.press_and_release("Space", delay=0.2)
  
         #Close Profile preferences window
-	self.keyboard.press_and_release("Alt+c")
-
-	#Change the Zoom Level
-        self.keyboard.press_and_release("Ctrl+plus")
-	self.keyboard.press_and_release("Ctrl+plus")
-	self.keyboard.press_and_release("Ctrl+plus")
-	self.keyboard.press_and_release("Ctrl+plus")
-	self.keyboard.press_and_release("Ctrl+-")
-	self.keyboard.press_and_release("Ctrl+-")
-
-	#Verify zoom level has changed
-
-
-	#Put Zoom level back as it was
-	self.keyboard.press_and_release("Ctrl+0")
+        self.keyboard.press_and_release("Alt+c")
+
+        #Change the Zoom Level
+        self.keyboard.press_and_release("Ctrl+plus")
+        self.keyboard.press_and_release("Ctrl+plus")
+        self.keyboard.press_and_release("Ctrl+plus")
+        self.keyboard.press_and_release("Ctrl+plus")
+        self.keyboard.press_and_release("Ctrl+-")
+        self.keyboard.press_and_release("Ctrl+-")
+
+        #Verify zoom level has changed
+
+
+        #Put Zoom level back as it was
+        self.keyboard.press_and_release("Ctrl+0")
 
 
     def test_terminal_coloring(self):
@@ -156,17 +156,17 @@
         #Type in ls
         self.keyboard.type("ls /tmp\n")
 
-	#Verify txt is in black
-
-
-	#Type in chmod 777 text1.txt
-	self.keyboard.type("chmod 777 /tmp/text1.txt\n")
-
-	#Type in ls
+        #Verify txt is in black
+
+
+        #Type in chmod 777 text1.txt
+        self.keyboard.type("chmod 777 /tmp/text1.txt\n")
+
+        #Type in ls
         self.keyboard.type("ls /tmp\n")
 
 
-	#Verify txt should now be green
+        #Verify txt should now be green
 
         #Delete the file we created
         self.addCleanup(remove, "/tmp/text1.txt")   
@@ -177,25 +177,25 @@
         #This test will check that the terminal tab launches succesfully
 
 
-	#Open Terminal using the dash, and typing 'terminal'
-	self.keyboard.press_and_release("Super")
-	self.keyboard.type("terminal\n")	
-
-	#Is an instance of gnome-terminal with the title '@: ~' opened, with the current directory set to the users home directory?
-
-
-        #Close opened terminal
-	self.keyboard.press_and_release("Ctrl+d", delay=0.2)
-
-	#Press Ctrl+Alt+T
-   	self.keyboard.press_and_release("Ctrl+Alt+t")
-
-	#Is an instance of gnome-terminal with the title '@: ~' opened, with the current directory set to the users home directory?
-
-
-        #Close opened terminal
-	self.keyboard.press_and_release("Ctrl+d")
-	self.keyboard.press_and_release("Ctrl+d") 
+        #Open Terminal using the dash, and typing 'terminal'
+        self.keyboard.press_and_release("Super")
+        self.keyboard.type("terminal\n")	
+
+        #Is an instance of gnome-terminal with the title '@: ~' opened, with the current directory set to the users home directory?
+
+
+        #Close opened terminal
+        self.keyboard.press_and_release("Ctrl+d", delay=0.2)
+
+        #Press Ctrl+Alt+T
+        self.keyboard.press_and_release("Ctrl+Alt+t")
+
+        #Is an instance of gnome-terminal with the title '@: ~' opened, with the current directory set to the users home directory?
+
+
+        #Close opened terminal
+        self.keyboard.press_and_release("Ctrl+d")
+        self.keyboard.press_and_release("Ctrl+d") 
         #Had to put two Ctrl+d's as the first one closes the terminal that opens with the launch of this test
 
 
@@ -207,20 +207,20 @@
         self.app.set_focus()
         self.assertTrue(self.app.is_focused)
 
-	#From the main menu select 'Terminal > Set Title...'
+        #From the main menu select 'Terminal > Set Title...'
         self.keyboard.press_and_release("Alt+t", delay=0.5)
-	self.keyboard.press_and_release("s", delay=0.5)
-	
-	#Verify the Set Title dialog appears
+        self.keyboard.press_and_release("s", delay=0.5)
+
+        #Verify the Set Title dialog appears
         #Check to see that the title of the window is "Set Title"
         #self.assertThat(lambda: self.app.name, Eventually(Contains("Set Title")))
         #Commented it as it does not work
-	
-	#Enter 'Test Title' and click OK
-	self.keyboard.type("Test Title")
-	self.keyboard.press_and_release("Alt+o")
-
-	#Is the title of the window now 'Test Title'?
+
+        #Enter 'Test Title' and click OK
+        self.keyboard.type("Test Title")
+        self.keyboard.press_and_release("Alt+o")
+
+        #Is the title of the window now 'Test Title'?
         #Check to see that the title reflects our 'Test Title'
         self.assertThat(lambda: self.app.name, Eventually(Contains("Test Title")))