Merge lp:~elopio/ubuntuone-testing/testability-devices into lp:ubuntuone-testing

[Leo Arias]

Added the actions to remove the device, and a test that removes it.

Added the actions to remove the device, and a test that removes it.
Of course, this test will make the previous fail because they expect to be on the control panel dashboard. Coming up next are the actions for the SSO login, to fix this.

[Rick McBride (rmcbride)]

review: Approve

=== added file 'ubuntuone/client/qt/tests/testabilitydriver/controlpanel/devices.rb'
--- ubuntuone/client/qt/tests/testabilitydriver/controlpanel/devices.rb	1970-01-01 00:00:00 +0000
+++ ubuntuone/client/qt/tests/testabilitydriver/controlpanel/devices.rb	2012-04-18 01:46:18 +0000
@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+require '../run-tests.rb' unless $INIT_COMPLETED
+require $actions_path + '/devices.rb'
+require $actions_path + '/wizard.rb'
+require $actions_path + '/controlpanel.rb'
+
+# Test Suite
+context "Devices tests" do
+
+    # Run once at the beginning of this test suite
+    startup do
+        $SUT.execute_shell_command 'killall ubuntuone-control-panel-qt'
+    end
+
+    # Run once at the end of this test suite
+    teardown do
+        $SUT.execute_shell_command 'killall ubuntuone-control-panel-qt'
+    end
+
+    # Run before each test case begins
+    setup do
+        # Execute the application 
+        @controlpanel = $SUT.run(:name=>'python',
+                            :start_command=>'ubuntuone-control-panel-qt ' +
+                                            '-testability',
+                            :sleep_time=>5)
+        wait_for_control_panel
+    end
+
+    # Run after each test case completes
+    teardown do
+        $SUT.execute_shell_command 'pkill -nf ubuntuone-control-panel-qt'
+    end
+
+    # Test cases
+
+    test "Remove this device" do
+        open_devices_tab
+        remove_this_device
+        verify_true(5) {
+            is_wizard_visible?
+        }
+        verify_false {
+            is_control_panel_visible?
+        }
+    end
+
+end

=== modified file 'ubuntuone/client/qt/tests/testabilitydriver/controlpanel/header-tests.rb'
--- ubuntuone/client/qt/tests/testabilitydriver/controlpanel/header-tests.rb	2012-04-17 21:47:41 +0000
+++ ubuntuone/client/qt/tests/testabilitydriver/controlpanel/header-tests.rb	2012-04-18 01:46:18 +0000
@@ -18,47 +18,47 @@
 =end
 
 require '../run-tests.rb' unless $INIT_COMPLETED
-require $actions_path + '/controlpanel.rb'
+require $actions_path + '/header.rb'
 
-############################# Test Suite #############################
+# Test Suite
 context "Header tests" do
 
-  # Run once at the beginning of this test suite
-  startup do
-    $SUT.execute_shell_command 'killall ubuntuone-control-panel-qt'
-  end
-
-  # Run once at the end of this test suite
-  teardown do
-    $SUT.execute_shell_command 'killall ubuntuone-control-panel-qt'
-  end
-
-  # Run before each test case begins
-  setup do
-    # Execute the application 
-    @controlpanel = $SUT.run(:name=>'python',
-                      :start_command=>'ubuntuone-control-panel-qt ' +
-                                      '-testability')
-  end
-
-  # Run after each test case completes
-  teardown do
-    $SUT.execute_shell_command 'pkill -nf ubuntuone-control-panel-qt'
-  end
-
-  # Test cases
-
-  test "Disconnect from service" do
-    connect_and_wait_for_file_sync_update
-    disconnect
-    verify_true(3, 'test disconnected') {
-      is_disconnected?
-    } 
-  end
-
-  test "Connect to service" do
-    disconnect
-    connect_and_wait_for_file_sync_update
-  end
+    # Run once at the beginning of this test suite
+    startup do
+        $SUT.execute_shell_command 'killall ubuntuone-control-panel-qt'
+    end
+
+    # Run once at the end of this test suite
+    teardown do
+        $SUT.execute_shell_command 'killall ubuntuone-control-panel-qt'
+    end
+
+    # Run before each test case begins
+    setup do
+        # Execute the application 
+        @controlpanel = $SUT.run(:name=>'python',
+                            :start_command=>'ubuntuone-control-panel-qt ' +
+                                            '-testability')
+    end
+
+    # Run after each test case completes
+    teardown do
+        $SUT.execute_shell_command 'pkill -nf ubuntuone-control-panel-qt'
+    end
+
+    # Test cases
+
+    test "Disconnect from service" do
+        connect_and_wait_for_file_sync_update
+        disconnect
+        verify_true(3, 'test disconnected') {
+            is_disconnected?
+        } 
+    end
+
+    test "Connect to service" do
+        disconnect
+        connect_and_wait_for_file_sync_update
+    end
 
 end

=== added file 'ubuntuone/client/qt/tests/testabilitydriver/shared/actions/common.rb'
--- ubuntuone/client/qt/tests/testabilitydriver/shared/actions/common.rb	1970-01-01 00:00:00 +0000
+++ ubuntuone/client/qt/tests/testabilitydriver/shared/actions/common.rb	2012-04-18 01:46:18 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+def click_yes_on_dialog_button
+    @controlpanel.QDialogButtonBox(:name=>'qt_msgbox_buttonbox').QPushButton(:text=>'&Yes').tap
+end

=== added file 'ubuntuone/client/qt/tests/testabilitydriver/shared/actions/controlpanel.rb'
--- ubuntuone/client/qt/tests/testabilitydriver/shared/actions/controlpanel.rb	1970-01-01 00:00:00 +0000
+++ ubuntuone/client/qt/tests/testabilitydriver/shared/actions/controlpanel.rb	2012-04-18 01:46:18 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+def is_control_panel_visible?
+    return @controlpanel.QWidget(:name=>'management'). \
+        attribute('visible') == 'true'
+end
+
+def wait_for_control_panel
+    wait_for_information
+    wait_for_tab_bar
+end
+
+def wait_for_information
+    verify_not(30, 'Information not loaded') {
+        @controlpanel.LoadingOverlay(:name=>'Form')
+    } 
+end
+
+def wait_for_tab_bar
+    verify_equal('true', 10, 'Tab bar not displayed') {
+        get_tab_bar.attribute('visible')
+    }
+end
+
+def get_tab_bar
+    return @controlpanel.QTabBar(:name=>'qt_tabwidget_tabbar')
+end

=== added file 'ubuntuone/client/qt/tests/testabilitydriver/shared/actions/devices.rb'
--- ubuntuone/client/qt/tests/testabilitydriver/shared/actions/devices.rb	1970-01-01 00:00:00 +0000
+++ ubuntuone/client/qt/tests/testabilitydriver/shared/actions/devices.rb	2012-04-18 01:46:18 +0000
@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+require $actions_path + '/common.rb'
+require $actions_path + '/controlpanel.rb'
+
+def open_devices_tab
+    click_devices_tab
+    wait_for_information
+    wait_for_devices_panel
+end
+
+def click_devices_tab
+    # XXX do not use coordinates. How to click a tab?
+    get_tab_bar.tap_object(150,20)
+end
+
+def wait_for_devices_panel
+    verify_equal('true', 10, 'Devices panel not displayed') {
+        @controlpanel.DevicesPanel(:name=>'devices_tab').attribute('visible')
+    }
+    verify_equal('true', 10, 'Devices panel not displayed') {
+        get_remove_this_device_button.attribute('enabled')
+    }
+end
+
+def remove_this_device(confirm=true)
+    click_remove_this_device
+    if confirm
+        confirm_device_removal
+    else
+        cancel_device_removal
+    end
+end
+
+def click_remove_this_device
+    get_remove_this_device_button.tap
+end
+
+def get_remove_this_device_button
+    return @controlpanel.DeviceWidget(:name=>'local_device'). \
+        QPushButton(:name=>'remove_device_button')
+end
+
+def confirm_device_removal
+     click_yes_on_dialog_button
+end
+
+def cancel_device_removal
+    # TODO
+    raise "Not implemented"
+end

=== renamed file 'ubuntuone/client/qt/tests/testabilitydriver/shared/actions/controlpanel.rb' => 'ubuntuone/client/qt/tests/testabilitydriver/shared/actions/header.rb'
--- ubuntuone/client/qt/tests/testabilitydriver/shared/actions/controlpanel.rb	2012-04-17 21:47:41 +0000
+++ ubuntuone/client/qt/tests/testabilitydriver/shared/actions/header.rb	2012-04-18 01:46:18 +0000
@@ -27,17 +27,14 @@
     return get_sync_status_button_text == 'Disconnect'
 end
 
-private
 def get_sync_status_button_text
     return get_sync_status_button.attribute('text')
 end
 
-private
 def get_sync_status_button
     return @controlpanel.QPushButton(:name=>'sync_status_button')
 end
 
-private
 def click_sync_status_button
     get_sync_status_button.tap
 end
@@ -47,12 +44,10 @@
         get_sync_status_label_text == 'File Sync is disconnected.'
 end
 
-private
 def get_sync_status_label_text
     return get_sync_status_label.attribute('text')
 end
 
-private
 def get_sync_status_label
     return @controlpanel.QLabel(:name=>'sync_status_label')
 end
@@ -64,7 +59,6 @@
     wait_for_file_sync_update
 end
 
-private
 def wait_for_file_sync_update
     # TODO define a timeout.
     verify_true(360, 'test connected') {
@@ -72,7 +66,6 @@
     }
 end
 
-private
 def is_file_sync_up_to_date?
     return get_sync_status_label_text == 'File Sync is up-to-date.'
 end

=== added file 'ubuntuone/client/qt/tests/testabilitydriver/shared/actions/wizard.rb'
--- ubuntuone/client/qt/tests/testabilitydriver/shared/actions/wizard.rb	1970-01-01 00:00:00 +0000
+++ ubuntuone/client/qt/tests/testabilitydriver/shared/actions/wizard.rb	2012-04-18 01:46:18 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby1.8
+=begin
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+=end
+
+def is_wizard_visible?
+    return @controlpanel.UbuntuOneWizard.attribute('visible') == 'true'
+end