Merge lp:~saviq/unity-2d/test_lens-bar-navigation into lp:unity-2d

[Michał Sawicz]

[tests] add lens bar left navigation test

[lp:~saviq/unity-2d/test_lens-bar-navigation]

881. By Michał Sawicz on 2012-01-30

[test] make the test more generic

[Gerry Boland (gerboland)]

Could you please add a timeout > 0 for the verify & verify_equal statements. I'd be worried on first opening of the dash, that the lenses hadn't loaded by the time the verify check is called, so failing the test. Timeout adds a little forgiveness there, and causes no harm.

review: Needs Fixing

[Michał Sawicz (saviq)]

Done.

[lp:~saviq/unity-2d/test_lens-bar-navigation]

882. By Michał Sawicz on 2012-01-31

[tests] add timeouts in verify*

[Albert Astals Cid (aacid)]

I think the last verify_not (the one that holds the verify_equal) should not use TIMEOUT, we are already waiting inside for 2 seconds no need to wait for TIMEOUT more

Also was wondering if instead of "loader.call_method('forceActiveFocus()')" would be better to use keyboard interaction and simulate a down arrow keypress

[Michał Sawicz (saviq)]

> I think the last verify_not (the one that holds the verify_equal) should not
> use TIMEOUT, we are already waiting inside for 2 seconds no need to wait for
> TIMEOUT more
True that, I'm not yet 100% sure on the nested verify*s.

> Also was wondering if instead of "loader.call_method('forceActiveFocus()')"
> would be better to use keyboard interaction and simulate a down arrow keypress
That, too - it was needed in the previous version of this test but seems unnecessary now.

Fixed.

[lp:~saviq/unity-2d/test_lens-bar-navigation]

883. By Michał Sawicz on 2012-01-31

[tests] drop the timeout, use keyboard nav instead of forceActiveFocus()

[Albert Astals Cid (aacid)]

Like it, will let Gerry have the final say though :-)

review: Approve (functional)

[Gerry Boland (gerboland)]

Gerry happy, Gerry approved!

review: Approve

=== modified file 'places/dash.qml'
--- places/dash.qml	2012-01-25 11:22:45 +0000
+++ places/dash.qml	2012-01-31 09:11:23 +0000
@@ -270,6 +270,7 @@
 
         Loader {
             id: pageLoader
+            objectName: "pageLoader"
 
             Accessible.name: "loader"
             /* FIXME: check on visible necessary; fixed in Qt Quick 1.1

=== modified file 'tests/places/places-tests.rb'
--- tests/places/places-tests.rb	2012-01-27 14:35:35 +0000
+++ tests/places/places-tests.rb	2012-01-31 09:11:23 +0000
@@ -252,4 +252,36 @@
     xid.close!
   end
 
+  # Test case objectives:
+  #   * Check navigation left from dash is disabled
+  # Pre-conditions
+  #   * Desktop with no running applications
+  # Test steps
+  #   * Invoke dash
+  #   * Focus dash contents, press left
+  #   * Check that focus is still on the first lens bar entry
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "Check navigation left from dash is disabled" do
+    XDo::Keyboard.super
+    verify(TIMEOUT, 'There should be a Dash declarative view after pressing Super') {
+      @app_places.DashDeclarativeView()
+    }
+    loader = ""
+    verify(TIMEOUT, 'Could not find the DashLoader') {
+      loader = @app_places.QDeclarativeLoader( { :objectName => "pageLoader" } )
+    }
+    XDo::Keyboard.down
+    verify_equal("true", TIMEOUT, 'Dash loader doesn\'t have focus') {
+        loader['activeFocus']
+    }
+    XDo::Keyboard.left
+    verify_not(0, 'Dash loader lost focus after pressing left') {
+        verify_equal("false", 2) {
+            loader['activeFocus']
+        }
+    }
+  end
 end