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

[Albert Astals Cid]

[tests] Use a way to get the bfb that works on other locales

[Lohith D Shivamurthy (dyams)]

They look good to me. But when i ran the tests i had
12 tests, 3 assertions, 1 failures, 4 errors

1) Error:
test_Move_window_positioning_to_check_launcher_action(Launcher_Autohide_and_Show_Tests):
MobyBase::BehaviourError: Run failed. Failed to launch application. Exception: The application with Id 8296 is no longer available.

2) Error: same error
test_Reveal_hidden_Launcher_with_mouse(Launcher_Autohide_and_Show_Tests):

3) Error:
test_Hold_Super_key_down_to_reveal_launcher_and_shortcut_keys(Launcher_Autohide_and_Show_Tests):

4) Error: same error
test_Press_Alt_F1_to_focus_Launcher(Launcher_Autohide_and_Show_Tests):

5) Failure :
test_Launcher_hide_delay_on_tile_removal(Launcher_Autohide_and_Show_Tests)
Details:
#<MobyBase::TestObjectNotFoundError: Cannot find object with rule:
{:running=>"false", :desktopFile=>/^.*.desktop$/}>

[Albert Astals Cid (aacid)]

You probably get the same errors without my changes? My changes are not even in the tests that failed for you

[Gerry Boland (gerboland)]

Yep, those errors are unrelated.

We could do with a localisation-free way of identifying tiles in general. Either setting an objectName with the unlocalised application name, or derive it from the .desktop file name.

But this is a good fix for the BFB. Thanks!

review: Approve

=== modified file 'tests/launcher/autohide_show_tests.rb'
--- tests/launcher/autohide_show_tests.rb	2012-01-26 12:54:51 +0000
+++ tests/launcher/autohide_show_tests.rb	2012-01-31 15:43:25 +0000
@@ -291,9 +291,7 @@
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     verify_equal( 'true', TIMEOUT, 'Dash icon not highlighted after Alt+F1 pressed' ){
-      @app.LauncherList( :name => 'main' ) \
-          .QDeclarativeItem( :name => 'Dash home' ) \
-          .QDeclarativeImage( :name => 'selectionOutline' )['visible']
+      @app.LauncherList( :name => 'main' ).LauncherList( :isBfb => true ).QDeclarativeImage( :name => 'selectionOutline' )['visible']
     }
 
     XDo::Keyboard.escape
@@ -336,9 +334,7 @@
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     verify_equal( 'true', TIMEOUT, 'Dash icon not highlighted after Alt+F1 pressed' ) {
-      @app.LauncherList( :name => 'main' ) \
-          .QDeclarativeItem( :name => 'Dash home' ) \
-          .QDeclarativeImage( :name => 'selectionOutline' )['visible']
+      @app.LauncherList( :name => 'main' ).LauncherList( :isBfb => true ).QDeclarativeImage( :name => 'selectionOutline' )['visible']
     }
     assert_not_equal( xid.id, XDo::XWindow.active_window, \
                   'terminal has focus when it should be in the launcher' )

=== modified file 'tests/launcher/visual_verification.rb'
--- tests/launcher/visual_verification.rb	2012-01-23 16:38:29 +0000
+++ tests/launcher/visual_verification.rb	2012-01-31 15:43:25 +0000
@@ -59,10 +59,7 @@
   test "Visually compare Dash tile with reference" do
     expected_image = pwd + 'verification/dash-tile.png'
     
-    dash_tile = @app.Unity2dPanel() \
-        .LauncherList( :name => 'main' ) \
-        .QDeclarativeItem( :name => 'Dash home' ) \
-        .QDeclarativeItem()
+    dash_tile = @app.LauncherList( :name => 'main' ).LauncherList( :isBfb => true ).QDeclarativeItem()
 
     #Check tile visual matches reference image, with some tolerance.
     assert( dash_tile.find_on_screen(expected_image, 4), \