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

[Albert Astals Cid]

[test] Check that doing Super+s with the dash open does not type s in the search entry

[Michał Sawicz (saviq)]

You should kill / launch the spread yourself here to make sure it runs from your build dir and not the system one.

review: Needs Fixing

[Gerry Boland (gerboland)]

Yep, please do as Michał suggested.

My only concern is with the "sleep 1" at the end. It *should* be enough, when you've manually loaded the spread in the script, but on a slow machine...

I think you'd better kill the spread in the test teardown, just in case a verify statment fails.

[Albert Astals Cid (aacid)]

Pushed the fixes regarding starting/killing the spread

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

871. By Albert Astals Cid on 2012-01-25

Create and kill the spread ourselves, this way there's no need to wait that second and press esc and you make sure it's this build spread you are testing

872. By Albert Astals Cid on 2012-01-25

merge

873. By Albert Astals Cid on 2012-01-25

Convert it to a manual test :-/

874. By Albert Astals Cid on 2012-01-26

merge

=== modified file 'tests/manual-tests/places.txt'
--- tests/manual-tests/places.txt	2011-12-21 15:22:56 +0000
+++ tests/manual-tests/places.txt	2012-01-25 17:09:40 +0000
@@ -17,3 +17,23 @@
 --> The text "Filter results" gets highlighted and no underline is shown. (lp:893061)
 
 ----
+
+  # Test case objectives:
+  #   * Check that Super+s does not type s in the search line
+  # Pre-conditions
+  #   * Desktop with no running applications
+  # Test steps
+  #   * Verify dash is not showing
+  #   * Press Alt+F2
+  #   * Verify dash is showing
+  #   * Verify there is no text in the search line
+  #   * Press Super+s
+  #   * Verify there is no text in the search line
+  # Post-conditions
+  #   * None
+  # References
+  #   * There is a test case for this called "Super+s does not type s"
+  #     but it does not work realiably because of the reasons explained
+  #     in the places-tests.rb file
+
+----
\ No newline at end of file

=== modified file 'tests/places/places-tests.rb'
--- tests/places/places-tests.rb	2012-01-25 08:51:36 +0000
+++ tests/places/places-tests.rb	2012-01-25 17:09:40 +0000
@@ -38,6 +38,9 @@
     $SUT.execute_shell_command 'killall unity-2d-launcher'
     $SUT.execute_shell_command 'killall unity-2d-launcher'
 
+    $SUT.execute_shell_command 'killall unity-2d-spread'
+    $SUT.execute_shell_command 'killall unity-2d-spread'
+
     # Minimize all windows
     XDo::XWindow.toggle_minimize_all
   end
@@ -57,14 +60,18 @@
                               :arguments => "-testability", 
                               :sleeptime => 2 )
 
+    @app_spread = $SUT.run( :name => UNITY_2D_SPREAD, 
+                            :arguments => "-testability", 
+                            :sleeptime => 2 )
   end
 
   # Run after each test case completes
   teardown do
     TmpWindow.close_all_windows
     #Need to kill Launcher as it does not shutdown when politely asked
+    $SUT.execute_shell_command 'pkill -nf unity-2d-spread'
+    $SUT.execute_shell_command 'pkill -nf unity-2d-places'
     $SUT.execute_shell_command 'pkill -nf unity-2d-launcher'
-    $SUT.execute_shell_command 'pkill -nf unity-2d-places'
   end
 
   #####################################################################################
@@ -119,4 +126,40 @@
         @app_places.DashDeclarativeView()
     }
   end
+
+  # Test case objectives:
+  #   * Check that Super+s does not type s
+  # Pre-conditions
+  #   * Desktop with no running applications
+  # Test steps
+  #   * Verify dash is not showing
+  #   * Press Alt+F2
+  #   * Verify dash is showing
+  #   * Verify there is no text in the search entry
+  #   * Press Super+s
+  #   * Verify there is no text in the search entry
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  # FIXME This does not work reliably because the spread clears the search entry
+  #       and thus sometimes we ask for the contents too late
+  xtest "Super+s does not type s" do
+    verify_not(0, 'There should not be a Dash declarative view on startup') {
+      @app_places.DashDeclarativeView()
+    }
+    XDo::Keyboard.alt_F2 #Must use uppercase F to indicate function keys
+    verify(TIMEOUT, 'There should be a Dash declarative view after pressing Alt+F2') {
+      @app_places.DashDeclarativeView()
+    }
+    verify_equal("", TIMEOUT, 'There should be no text in the Search Entry') {
+      @app_places.DashDeclarativeView().SearchEntry().QDeclarativeTextInput()['text']
+    }
+    XDo::Keyboard.super_s
+    verify_not(0, "Text of the Search Entry should not be an 's'") {
+      verify_equal( "s", 1 ) {
+        @app_places.DashDeclarativeView().SearchEntry().QDeclarativeTextInput()['text']
+      }
+    }
+  end
 end