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

[Albert Astals Cid]

[test] Add a file with the common definitions of variables

[Gerry Boland (gerboland)]

This is great, thank you.

Suggestions:
1. Would it not make sense to include the definitions.rb file in run-tests.rb? I don't see it causing problems
2. If you disagree with 1, then I want to point out the following:

In Ruby1.8, require is pretty stupid. Whenever you require a file, it keeps a list of the files you 'require' to prevent you requiring the same file twice. Great! But the way it does this is naive. In your case it saves $PWD + '../misc/definitions.rb' -> '/home/you/dev/unity-2d-shell/tests/launcher/../misc/definitions.rb'

Now for a test in the tests/places directory, if you do the same require statement, require considers '/home/you/dev/unity-2d-shell/tests/places/../misc/definitions.rb' which doesn't match anything in the list, so the file gets required again, and you get constant redefined warnings.

Ruby1.9 fixes this. But we're stuck with 1.8 for now (Testability has't been ported to 1.9).

Solution: require $library_path + '/misc/definitions.rb'

review: Needs Fixing

[Albert Astals Cid (aacid)]

Makes sense, included in run-tests.rb

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

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

Include definitions.rb from run-tests.rb as suggested by Gerry

[Gerry Boland (gerboland)]

Beautiful, merging!

review: Approve

=== modified file 'tests/launcher/always_visible_tests.rb'
--- tests/launcher/always_visible_tests.rb	2012-01-25 16:09:01 +0000
+++ tests/launcher/always_visible_tests.rb	2012-01-26 12:58:23 +0000
@@ -30,7 +30,6 @@
 
 ############################# Test Suite #############################
 context "Launcher Always Visible Behaviour Tests" do
-  WIDTH = 65 #launcher bar width
   hide_mode = 0
 
   # Run once at the beginning of this test suite
@@ -88,9 +87,9 @@
   #   * None
   test "Launcher pushes windows" do
       $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 2'
-      xid = TmpWindow.open_window_at(WIDTH / 2, 10)
+      xid = TmpWindow.open_window_at(LAUNCHER_WIDTH / 2, 10)
       $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 0'
-      verify_equal( WIDTH + 1, TIMEOUT, 'Window was not pushed by setting Launcher to always visible' ) {
+      verify_equal( LAUNCHER_WIDTH + 1, TIMEOUT, 'Window was not pushed by setting Launcher to always visible' ) {
         xid.position[0]
       }
       xid.close!

=== modified file 'tests/launcher/autohide_show_tests.rb'
--- tests/launcher/autohide_show_tests.rb	2012-01-24 17:06:04 +0000
+++ tests/launcher/autohide_show_tests.rb	2012-01-26 12:58:23 +0000
@@ -30,7 +30,6 @@
 
 ############################# 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
@@ -79,7 +78,7 @@
   # Pre-conditions
   #   * Desktop with no running applications
   # Test steps
-  #   * Verify Launcher is #{WIDTH} pixels wide
+  #   * Verify Launcher is #{LAUNCHER_WIDTH} pixels wide
   #   * Verify Launcher showing
   # Post-conditions
   #   * None
@@ -87,7 +86,7 @@
   #   * None
   test "Position with Empty Desktop" do
     # check width before proceeding
-    verify_equal( WIDTH, TIMEOUT, "Launcher is not #{WIDTH} pixels wide on screen!" ) {
+    verify_equal( LAUNCHER_WIDTH, TIMEOUT, "Launcher is not #{LAUNCHER_WIDTH} pixels wide on screen!" ) {
       @app.Unity2dPanel()['width'].to_i
     }
 
@@ -132,7 +131,7 @@
   test "Position with Window in the way" do
     # Open Terminal with position 40x100
     xid = TmpWindow.open_window_at(40,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible when window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible when window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     xid.close!
@@ -161,12 +160,12 @@
       @app.Unity2dPanel()['x_absolute'].to_i
     }
 
-    xid.move(WIDTH-1,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible when window in the way, should be hidden' ) {
+    xid.move(LAUNCHER_WIDTH-1,100)
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible when window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
 
-    xid.move(WIDTH,100)
+    xid.move(LAUNCHER_WIDTH,100)
     verify_equal( 0, TIMEOUT, 'Launcher hiding when window not in the way, should be visible' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
@@ -193,30 +192,30 @@
   #   * None
   test "Reveal hidden Launcher with mouse" do
     xid = TmpWindow.open_window_at(10,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
 
     XDo::Mouse.move(0,200)
     sleep 0.4
-    verify_equal( -WIDTH, 0, 'Launcher should not be visible immediately after mouse moves to the left edge, has to wait 0.5 seconds to show' ) {
+    verify_equal( -LAUNCHER_WIDTH, 0, 'Launcher should not be visible immediately after mouse moves to the left edge, has to wait 0.5 seconds to show' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     verify_equal( 0, TIMEOUT, 'Launcher hiding when mouse at left edge of screen' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
 
-    XDo::Mouse.move(WIDTH-1,200)
+    XDo::Mouse.move(LAUNCHER_WIDTH-1,200)
     verify_equal( 0, TIMEOUT, 'Launcher should still be visible as mouse over it' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
 
-    XDo::Mouse.move(WIDTH,200)
+    XDo::Mouse.move(LAUNCHER_WIDTH,200)
     sleep 0.9
     verify_equal( 0, 0, 'Launcher should still be visible as it should take 1 second to hide after mouse is not over it' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way and mouse moved out, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way and mouse moved out, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     xid.close!
@@ -241,7 +240,7 @@
   #   * None
   test "Hold Super key down to reveal launcher and shortcut keys" do
     xid = TmpWindow.open_window_at(10,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
 
@@ -258,7 +257,7 @@
     }  
 
     XDo::Keyboard.key_up('SUPER')
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way and mouse moved out, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way and mouse moved out, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     xid.close!
@@ -283,7 +282,7 @@
   #   * None
   test "Press Alt+F1 to focus Launcher" do
     xid = TmpWindow.open_window_at(10,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
 
@@ -298,7 +297,7 @@
     }
 
     XDo::Keyboard.escape
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way and mouse moved out, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way and mouse moved out, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     xid.close!
@@ -326,7 +325,7 @@
   #   * None
   test "Press Alt+F1 to focus/unfocus Launcher" do
     xid = TmpWindow.open_window_at(10,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     assert_equal( xid.id, XDo::XWindow.active_window, \
@@ -345,7 +344,7 @@
                   'terminal has focus when it should be in the launcher' )
 
     XDo::Keyboard.alt_F1
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way and mouse moved out, should be hidden' ){
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way and mouse moved out, should be hidden' ){
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     assert_equal( xid.id, XDo::XWindow.active_window, \
@@ -371,7 +370,7 @@
   #   * None
   test "Launcher visible on show-desktop" do
     xid = TmpWindow.open_window_at(10,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
 
@@ -381,7 +380,7 @@
     }
 
     XDo::XWindow.toggle_minimize_all
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     xid.close!
@@ -425,7 +424,7 @@
       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' ) {
+      verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
         @app.Unity2dPanel()['x_absolute'].to_i
       }
       xid.close!
@@ -449,7 +448,7 @@
   # * None
   test "Launcher visible after toggling dash" do
     xid = TmpWindow.open_window_at(10,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
  
@@ -462,7 +461,7 @@
     bfb.tap()
     bfb.tap()
     verify_not(0, 'Launcher hiding after hovering mouse over bfb and clicking twice') {
-      verify_equal( -WIDTH, 2 ) {
+      verify_equal( -LAUNCHER_WIDTH, 2 ) {
         @app.Unity2dPanel()['x_absolute'].to_i
       }
     }
@@ -488,7 +487,7 @@
   # * None
   test "Launcher does not hide on Esc after Alt+F1 with overlapping window" do
     xid = TmpWindow.open_window_at(10,100)
-    verify_equal( -WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
+    verify_equal( -LAUNCHER_WIDTH, TIMEOUT, 'Launcher visible with window in the way, should be hidden' ) {
       @app.Unity2dPanel()['x_absolute'].to_i
     }
     XDo::Keyboard.alt_F1 #Must use uppercase F to indicate function keys
@@ -496,7 +495,7 @@
     bfb.move_mouse()
     XDo::Keyboard.escape
     verify_not(0, 'Launcher hiding after hovering mouse over bfb and clicking twice') {
-      verify_equal( -WIDTH, 2 ) {
+      verify_equal( -LAUNCHER_WIDTH, 2 ) {
         @app.Unity2dPanel()['x_absolute'].to_i
       }
     }

=== modified file 'tests/launcher/launcher_sizing.rb'
--- tests/launcher/launcher_sizing.rb	2012-01-25 08:17:38 +0000
+++ tests/launcher/launcher_sizing.rb	2012-01-26 12:58:23 +0000
@@ -30,7 +30,6 @@
 
 ############################# Test Suite #############################
 context "Sizing tests" do
-  PANEL_HEIGHT=24
   # Run once at the beginning of this test suite
   startup do
     $SUT.execute_shell_command 'killall unity-2d-launcher'

=== added file 'tests/misc/lib/definitions.rb'
--- tests/misc/lib/definitions.rb	1970-01-01 00:00:00 +0000
+++ tests/misc/lib/definitions.rb	2012-01-26 12:58:23 +0000
@@ -0,0 +1,3 @@
+
+LAUNCHER_WIDTH = 65
+PANEL_HEIGHT = 24

=== modified file 'tests/run-tests.rb'
--- tests/run-tests.rb	2012-01-24 11:47:05 +0000
+++ tests/run-tests.rb	2012-01-26 12:58:23 +0000
@@ -56,6 +56,9 @@
     UNITY_2D_SPREAD = 'unity-2d-spread'
 end
 
+# Require a file with some common constants
+require $library_path+ '/definitions.rb'
+
 # The following line includes the complete tdriver environment 
 require 'tdriver'
 include TDriverVerify