Merge lp:~aacid/unity-2d/unity-2d_test_launcher_hide_delay_on_tile_removal into lp:unity-2d

[Albert Astals Cid]

[test] Check that the launcher is around for 1 second after removing an application tile

[lp:~aacid/unity-2d/unity-2d_test_launcher_hide_delay_on_tile_removal]

855. By Albert Astals Cid on 2012-01-18

Nice way to find a non running application

856. By Albert Astals Cid on 2012-01-19

merge trunk

[Michał Sawicz (saviq)]

Please use gsettings instead of dconf, as it's available in a default installation.

review: Needs Fixing

[lp:~aacid/unity-2d/unity-2d_test_launcher_hide_delay_on_tile_removal]

857. By Albert Astals Cid on 2012-01-19

We need to wait more than 1 sec here, otherwise we still have the timer of having moved the mouse out of the launcher applies

[Michał Sawicz (saviq)]

I'm thinking DConf profiles might help in providing a clean test env and leaving it clean after we leave, see https://live.gnome.org/dconf/SystemAdministrators#Profiles.

The issue with using `dconf write` or `gsettings set` is that the value will be written in the users' database, even if they didn't touch it themselves. That will prevent them from getting any new defaults introduced later on.

[lp:~aacid/unity-2d/unity-2d_test_launcher_hide_delay_on_tile_removal]

858. By Albert Astals Cid on 2012-01-19

Use gsettings instead of dconf

[Michał Sawicz (saviq)]

One last thing: since you've added the 1sec delay, could you also please add that to the test steps? Cheers.

Gerry, hope you're not angry for me stealing your review a bit ;)

[lp:~aacid/unity-2d/unity-2d_test_launcher_hide_delay_on_tile_removal]

859. By Albert Astals Cid on 2012-01-19

Add the wait step to step list

[Gerry Boland (gerboland)]

Saviq: not at all :)

My comment:
+ tiles = @app.LauncherList( :name => 'main' ).children( { :running => 'false', :desktopFile => /^.*.desktop$/ } )
+ verify( 0, 'Could not find any non running application tile to remove' ) { !tiles.empty? }

From the docs[1] it looks like 'children' returns an exception if no matching child is found. Is that right? So then it should be inside the verify block, to at least get a readable error message.

Note that "verify(0){ block }" triggers a fail only if "block" throws an exception. I suggest you use verify_true or verify_false, ref [1].

[1] https://projects.developer.nokia.com/dav/Testabilitydriver/doc/api/qt_linux/#GenericTestObject:children

[lp:~aacid/unity-2d/unity-2d_test_launcher_hide_delay_on_tile_removal]

860. By Albert Astals Cid on 2012-01-19

Fix test in case no children around

tiles = @app.LauncherList( :name => 'main' ).children( { :running => 'false', :desktopFile => /^.*.desktop$/ } )
returns an exception if no match happens to move it inside the verify and remove the check for empty in there,
which was actually wrong since verify just checks for exceptions, not for true-ness of the value

861. By Albert Astals Cid on 2012-01-19

merge

[Michał Sawicz (saviq)]

I'm OK with that, Gerry?

review: Approve

[Gerry Boland (gerboland)]

Yep, approved.

=== modified file 'tests/launcher/autohide_show_tests.rb'
--- tests/launcher/autohide_show_tests.rb	2012-01-18 12:11:19 +0000
+++ tests/launcher/autohide_show_tests.rb	2012-01-19 15:56:30 +0000
@@ -31,6 +31,7 @@
 ############################# Test Suite #############################
 context "Launcher Autohide and Show Tests" do
   WIDTH = 65 #launcher bar width
+  launcher_favorites = ""
 
   # Run once at the beginning of this test suite
   startup do
@@ -50,6 +51,8 @@
     #Ensure mouse out of the way
     XDo::Mouse.move(200,200,10,true)    
 
+    launcher_favorites = `gsettings get com.canonical.Unity.Launcher favorites`
+
     # Execute the application 
     @sut = TDriver.sut(:Id => "sut_qt")    
     @app = @sut.run( :name => UNITY_2D_LAUNCHER, 
@@ -65,6 +68,7 @@
     #@app.close        
     #Need to kill Launcher as it does not shutdown when politely asked
     system "pkill -nf unity-2d-launcher"
+    system "gsettings set com.canonical.Unity.Launcher favorites \"" + launcher_favorites + "\""
   end
 
   #####################################################################################
@@ -383,4 +387,49 @@
     xid.close!
   end
 
+  # Test case objectives:
+  #   * Launcher is around for 1 second after removing a tile
+  # Pre-conditions
+  #   * Desktop with at least one application not running
+  # Test steps
+  #   * Open application in position overlapping Launcher
+  #   * Verify Launcher hiding
+  #   * Right click on a non running application tile
+  #   * Wait enough time ( > 1 sec) so that the timer that would close the launcher
+  #     if the menu was not open triggers
+  #   * Click on the last menu item (Remove)
+  #   * Verify Launcher stays away for a second
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "Launcher hide delay on tile removal" do
+    xid = TmpWindow.open_window_at(10,100)
+    tiles = ""
+    verify( 0, 'Could not find any non running application tile to remove' ) {
+        tiles = @app.LauncherList( :name => 'main' ).children( { :running => 'false', :desktopFile => /^.*.desktop$/ } )
+    }
+    if !tiles.empty?
+      tile = tiles[0]
+      XDo::Mouse.move(0, 200, 0, true)
+      verify_equal( 0, TIMEOUT, 'Launcher hiding when mouse at left edge of screen' ) {
+        @app.Unity2dPanel()['x_absolute'].to_i
+      }
+      XDo::Mouse.move(tile['x_absolute'].to_i + 1, tile['y_absolute'].to_i + 1, 0, true)
+      XDo::Mouse.click(nil, nil, :right)
+      menu = @app.LauncherContextualMenu( :folded => false );
+      XDo::Mouse.move(menu['x_absolute'].to_i + 20, menu['y_absolute'].to_i + menu['height'].to_i - 10, 0, true)
+      sleep 1.5
+      XDo::Mouse.click()
+      sleep 0.9
+      verify_equal( 0, 0, 'Launcher hiding after icon removal, should be visible for 1 second' ) {
+        @app.Unity2dPanel()['x_absolute'].to_i
+      }
+      verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+        @app.Unity2dPanel()['x_absolute'].to_i
+      }
+      xid.close!
+    end
+  end
+
 end