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

[Albert Astals Cid]

[tests] Port tests/places/fullscreen.rb to target/host divide

* do not use @sut = TDriver.sut(:Id => "sut_qt")
* do not use system
* do not use %x{}

[Lohith D Shivamurthy (dyams)]

They look fine.

review: Approve

[Gerry Boland (gerboland)]

Yep, approving.

Tip: you can do
width, height = XDo::XWindow.display_geometry()

review: Approve

=== modified file 'tests/places/fullscreen.rb'
--- tests/places/fullscreen.rb	2012-01-26 18:58:40 +0000
+++ tests/places/fullscreen.rb	2012-01-31 15:20:30 +0000
@@ -43,10 +43,10 @@
 
   # Run once at the beginning of this test suite
   startup do
-    system 'killall unity-2d-places > /dev/null 2>&1'
-    system 'killall unity-2d-panel > /dev/null 2>&1'
-    system 'killall unity-2d-launcher > /dev/null 2>&1'
-    system 'killall unity-2d-launcher > /dev/null 2>&1'
+    $SUT.execute_shell_command 'killall unity-2d-places'
+    $SUT.execute_shell_command 'killall unity-2d-panel'
+    $SUT.execute_shell_command 'killall unity-2d-launcher'
+    $SUT.execute_shell_command 'killall unity-2d-launcher'
 
     # Minimize all windows
     XDo::XWindow.toggle_minimize_all
@@ -58,18 +58,17 @@
 
   # Run before each test case begins
   setup do
-    @fullscreen_old = %x{dconf read #{DASH_FULLSCREEN_KEY}}.chop
-    @formfactor_old = %x{dconf read #{DASH_FORMFACTOR_KEY}}.chop
+    @fullscreen_old = ($SUT.execute_shell_command "dconf read #{DASH_FULLSCREEN_KEY}").chop
+    @formfactor_old = ($SUT.execute_shell_command "dconf read #{DASH_FORMFACTOR_KEY}").chop
 
     # Execute the application
-    @sut = TDriver.sut(:Id => "sut_qt")
-    @dash = @sut.run(:name => UNITY_2D_PLACES,
-                    :arguments => "-testability",
-                    :sleeptime => 2)
-    @panel = @sut.run(:name => UNITY_2D_PANEL,
-                    :arguments => "-testability",
-                    :sleeptime => 2)
-    @launcher = @sut.run(:name => UNITY_2D_LAUNCHER,
+    @dash = $SUT.run(:name => UNITY_2D_PLACES,
+                    :arguments => "-testability",
+                    :sleeptime => 2)
+    @panel = $SUT.run(:name => UNITY_2D_PANEL,
+                    :arguments => "-testability",
+                    :sleeptime => 2)
+    @launcher = $SUT.run(:name => UNITY_2D_LAUNCHER,
                          :arguments => "-testability",
                          :sleeptime => 2)
 
@@ -80,17 +79,18 @@
 
   # Run after each test case completes
   teardown do
-    %x{dconf write #{DASH_FULLSCREEN_KEY} #{'"'}#{@fullscreen_old}#{'"'}}
-    %x{dconf write #{DASH_FORMFACTOR_KEY} #{'"'}#{@formfactor_old}#{'"'}}
+    $SUT.execute_shell_command "dconf write #{DASH_FULLSCREEN_KEY} #{@fullscreen_old}"
+    $SUT.execute_shell_command "dconf write #{DASH_FORMFACTOR_KEY} '#{@formfactor_old}"
 
-    system "pkill -nf unity-2d-panel"
-    system "pkill -nf unity-2d-places"
-    system "pkill -nf unity-2d-launcher"
+    $SUT.execute_shell_command "pkill -nf unity-2d-panel"
+    $SUT.execute_shell_command "pkill -nf unity-2d-places"
+    $SUT.execute_shell_command "pkill -nf unity-2d-launcher"
   end
 
   def dash_always_fullscreen
-    out = %x{xdotool getdisplaygeometry}
-    width, height = out.split.collect { |coord| coord.to_i }
+    out = XDo::XWindow.display_geometry()
+    width = out[0]
+    height = out[1]
     return width < DASH_MIN_SCREEN_WIDTH && height < DASH_MIN_SCREEN_HEIGHT
   end
 
@@ -98,8 +98,8 @@
   # Test cases
 
   test "Dash fullscreens on dconf key change" do
-    %x{dconf write #{DASH_FULLSCREEN_KEY} false}
-    %x{dconf write #{DASH_FORMFACTOR_KEY} #{'\"desktop\"'}}
+    $SUT.execute_shell_command "dconf write #{DASH_FULLSCREEN_KEY} false"
+    $SUT.execute_shell_command "dconf write #{DASH_FORMFACTOR_KEY} 'desktop'"
     XDo::Keyboard.super
     sleep 1
 
@@ -112,7 +112,7 @@
         @dash.DashDeclarativeView()['dashMode']
     }
 
-    %x{dconf write #{DASH_FULLSCREEN_KEY} true}
+    $SUT.execute_shell_command "dconf write #{DASH_FULLSCREEN_KEY} true"
     sleep 1
 
     verify_equal('FullScreenMode', TIMEOUT, 'Dash is not fullscreen but should be') {
@@ -121,8 +121,8 @@
   end
 
   test "Dash reacts correctly to panel buttons" do
-    %x{dconf write #{DASH_FULLSCREEN_KEY} false}
-    %x{dconf write #{DASH_FORMFACTOR_KEY} #{'\"desktop\"'}}
+    $SUT.execute_shell_command "dconf write #{DASH_FULLSCREEN_KEY} false"
+    $SUT.execute_shell_command "dconf write #{DASH_FORMFACTOR_KEY} 'desktop'"
     XDo::Keyboard.super
     sleep 1
     verify_equal('true', TIMEOUT, 'Dash did not appear') {
@@ -144,7 +144,7 @@
     # false.
     expected = dash_always_fullscreen ? 'false' : 'true'
     verify_equal(expected, TIMEOUT, 'Dash fullscreen key has the wrong value after maximize') {
-        %x{dconf read #{DASH_FULLSCREEN_KEY}}.chop
+        ($SUT.execute_shell_command "dconf read #{DASH_FULLSCREEN_KEY}").chop
     }
 
     maxbutton.tap if maxbutton
@@ -154,13 +154,13 @@
         @dash.DashDeclarativeView()['dashMode']
     }
     verify_equal('false', TIMEOUT, 'Dash fullscreen key was not unset') {
-        %x{dconf read #{DASH_FULLSCREEN_KEY}}.chop
+        ($SUT.execute_shell_command "dconf read #{DASH_FULLSCREEN_KEY}").chop
     }
   end
 
   test "Dash fullscreen initially" do
-    %x{dconf write #{DASH_FULLSCREEN_KEY} true}
-    %x{dconf write #{DASH_FORMFACTOR_KEY} #{'\"desktop\"'}}
+    $SUT.execute_shell_command "dconf write #{DASH_FULLSCREEN_KEY} true"
+    $SUT.execute_shell_command "dconf write #{DASH_FORMFACTOR_KEY} 'desktop'"
     XDo::Keyboard.super
     sleep 1
 
@@ -173,8 +173,8 @@
   end
 
   test "Dash always fullscreen if not desktop form factor" do
-    %x{dconf write #{DASH_FULLSCREEN_KEY} false}
-    %x{dconf write #{DASH_FORMFACTOR_KEY} #{'\"tv\"'}}
+    $SUT.execute_shell_command "dconf write #{DASH_FULLSCREEN_KEY} false"
+    $SUT.execute_shell_command "dconf write #{DASH_FORMFACTOR_KEY} 'tv'"
     XDo::Keyboard.super
     sleep 1