Merge lp:~nskaggs/sudoku-app/add-emulator-autopilot into lp:sudoku-app

[Nicholas Skaggs]

This change adds tests for number inputs and the high score tab

This change adds tests for number inputs and the high score tab

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:74
http://91.189.93.70:8080/job/sudoku-app-ci/2/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/1
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/2
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/2
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/1

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/2/rebuild

review: Approve (continuous-integration)

[lp:~nskaggs/sudoku-app/add-emulator-autopilot]

75. By Nicholas Skaggs on 2013-07-11

fix testcase for input numbers

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:75
http://91.189.93.70:8080/job/sudoku-app-ci/3/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/2
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/3
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/3
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/2

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/3/rebuild

review: Approve (continuous-integration)

[Dinko Osmankovic (dinko-metalac)]

review: Approve

=== modified file 'components/SudokuBlocksGrid.qml'
--- components/SudokuBlocksGrid.qml	2013-07-10 09:02:21 +0000
+++ components/SudokuBlocksGrid.qml	2013-07-11 22:05:30 +0000
@@ -292,6 +292,7 @@
 
                 Dialog {
                     id: dialogue
+                    objectName: "picknumberscreen"
                     //title: "Number Picker"
                     text: i18n.tr("Please pick a number")
 

=== modified file 'sudoku-app.qml'
--- sudoku-app.qml	2013-07-10 11:38:57 +0000
+++ sudoku-app.qml	2013-07-11 22:05:30 +0000
@@ -304,6 +304,7 @@
 
                     SudokuBlocksGrid {
                         id: sudokuBlocksGrid;
+                        objectName: "blockgrid"
                     }
 
                 }
@@ -320,6 +321,7 @@
             page: Page {
                 tools: ToolbarItems {
                     ToolbarButton {
+                        objectName: "allusersbutton"
                         action: Action {
                             text: "All\nusers"
                             iconSource: Qt.resolvedUrl("icons/all-users.svg")
@@ -341,6 +343,7 @@
                         }
                     }
                     ToolbarButton {
+                        objectName: "currentuserbutton"
                         action: Action {
                             text: "Current\nuser"
                             iconSource: Qt.resolvedUrl("icons/single-user.svg")
@@ -387,6 +390,7 @@
                         anchors.fill: parent
                         header: ListItem.Header {
                             id: highscoresHeader
+                            objectName: "highscoreslabel"
                             text: highscoresHeaderText
                         }
                         delegate: ListItem.SingleValue {

=== modified file 'tests/autopilot/sudoku_app/emulators/main_window.py'
--- tests/autopilot/sudoku_app/emulators/main_window.py	2013-07-11 16:46:16 +0000
+++ tests/autopilot/sudoku_app/emulators/main_window.py	2013-07-11 22:05:30 +0000
@@ -15,3 +15,20 @@
     """
     def __init__(self, app):
         self.app = app
+
+    def get_blank_inputs(self):
+        #generate a list of blank input fields from the game board
+        #SudokuBlocksGrid->..->SudokuButton->QQuickTest->enabled == true
+        inputs = self.app.select_single("SudokuBlocksGrid")
+        blankInputsList = inputs.select_many("QQuickText", enabled=True)
+        return blankInputsList
+
+    def get_dialog_button(self, name):
+        numberdialog = self.get_number_dialog()
+
+        #SudokuDialogButton->QQuickText text =
+        button = numberdialog.select_single("QQuickText",text=name)
+        return button
+
+    def get_number_dialog(self):
+        return self.app.select_single("Dialog", objectName="picknumberscreen")

=== modified file 'tests/autopilot/sudoku_app/emulators/ubuntusdk.py'
--- tests/autopilot/sudoku_app/emulators/ubuntusdk.py	2013-07-11 16:46:16 +0000
+++ tests/autopilot/sudoku_app/emulators/ubuntusdk.py	2013-07-11 22:05:30 +0000
@@ -38,6 +38,10 @@
         """Get more than one object"""
         return self.app.select_many(typeName, objectName=name)
 
+    def get_tabs(self):
+        """Return all tabs"""
+        return self.app.select_single("Tabs")
+
     def switch_to_tab(self, tab):
         """Switch to the specified tab number"""
         tabs = self.get_tabs()
@@ -46,11 +50,37 @@
         #perform operations until tab == currentTab
         while tab != currentTab:
             if tab > currentTab:
+                self._next_tab()
+            if tab < currentTab:
                 self._previous_tab()
-            if tab < currentTab:
-                self._next_tab()
             currentTab = tabs.selectedTabIndex
 
+    def _previous_tab(self):
+        """Switch to the previous tab"""
+        qmlView = self.get_qml_view()
+
+        startX = int(qmlView.x + qmlView.width * 0.10)
+        stopX = int(qmlView.x + qmlView.width * 0.35)
+        lineY = int(qmlView.y + qmlView.height * 0.05)
+
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
+        self.autopilot.pointing_device.move(startX, lineY)
+        self.autopilot.pointing_device.click()
+        self.autopilot.pointing_device.click()
+
+    def _next_tab(self):
+        """Switch to the next tab"""
+        qmlView = self.get_qml_view()
+
+        startX = int(qmlView.x + qmlView.width * 0.35)
+        stopX = int(qmlView.x + qmlView.width * 0.10)
+        lineY = int(qmlView.y + qmlView.height * 0.05)
+
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
+        self.autopilot.pointing_device.move(startX, lineY)
+        self.autopilot.pointing_device.click()
+        self.autopilot.pointing_device.click()
+
     def toggle_toolbar(self):
         """Toggle the toolbar between revealed and hidden"""
         #check and see if the toolbar is open or not
@@ -69,6 +99,9 @@
         if not toolbar.opened:
             self.open_toolbar()
         buttonList = toolbar.select_many("ActionItem")
+        #old version is ToolbarButton
+        if not buttonList:
+            buttonList = toolbar.select_many("ToolbarButton")
         for button in buttonList:
             if button.objectName == buttonObject:
                 return button
@@ -122,30 +155,3 @@
             if item.text == value:
                 self.autopilot.pointing_device.click_object(item)
                 return item
-
-    def get_tabs(self):
-        """Return all tabs"""
-        return self.get_object("Tabs", "rootTabs")
-
-    def _previous_tab(self):
-        """Switch to the previous tab"""
-        qmlView = self.get_qml_view()
-
-        startX = int(qmlView.x + qmlView.width * 0.35)
-        stopX = int(qmlView.x + qmlView.width * 0.50)
-        lineY = int(qmlView.y + qmlView.height * 0.05)
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    def _next_tab(self):
-        """Switch to the next tab"""
-        qmlView = self.get_qml_view()
-
-        startX = int(qmlView.x + qmlView.width * 0.50)
-        stopX = int(qmlView.x + qmlView.width * 0.35)
-        lineY = int(qmlView.y + qmlView.height * 0.05)
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.click()

=== modified file 'tests/autopilot/sudoku_app/tests/test_sudoku.py'
--- tests/autopilot/sudoku_app/tests/test_sudoku.py	2013-07-11 16:58:38 +0000
+++ tests/autopilot/sudoku_app/tests/test_sudoku.py	2013-07-11 22:05:30 +0000
@@ -10,7 +10,7 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals
+from testtools.matchers import Equals, Contains, NotEquals
 
 from sudoku_app.tests import SudokuTestCase
 
@@ -24,3 +24,65 @@
 
     def tearDown(self):
         super(TestMainWindow, self).tearDown()
+
+    def test_enter_and_clear_number(self):
+        #find the first button that has a blank value
+        gridButtons = self.main_window.get_blank_inputs()
+        gridButton = gridButtons[0]
+
+        #create a value function to check later using id
+        buttonValue = lambda: self.app.select_single("QQuickText",id=gridButton.id).text
+
+        #double check that it's blank
+        self.assertThat(buttonValue, Eventually(Equals("")))
+
+        #click the button
+        self.pointing_device.click_object(gridButton)
+
+        #assert that we can see the input screen
+        inputScreen = lambda: self.main_window.get_number_dialog()
+        self.assertThat(inputScreen, Eventually(NotEquals(None)))
+
+        #set a value, choose 4
+        dialogButton = self.main_window.get_dialog_button("4")
+        self.assertThat(dialogButton, NotEquals(None))
+        self.pointing_device.click_object(dialogButton)
+
+        #check the value to ensure it worked
+        self.assertThat(buttonValue, Eventually(Equals("4")))
+
+        #click the button
+        self.pointing_device.click_object(gridButton)
+
+        #assert that we can see the input screen
+        inputScreen = lambda: self.main_window.get_number_dialog()
+        self.assertThat(inputScreen, Eventually(NotEquals(None)))
+
+        #set a value, choose clear
+        dialogButton = self.main_window.get_dialog_button("Clear")
+        self.assertThat(dialogButton, NotEquals(None))
+        self.pointing_device.click_object(dialogButton)
+
+        #check the value to ensure it worked
+        self.assertThat(buttonValue, Eventually(Equals("")))
+
+    def test_best_scores_tab(self):
+        #switch to best scores tab
+        self.ubuntusdk.switch_to_tab(1)
+
+        #make sure we are in the right place
+        tabName = lambda: self.ubuntusdk.get_object("Tab","highscoresTab")
+        self.assertThat(tabName, Eventually(NotEquals(None)))
+
+        #click current user button
+        self.ubuntusdk.click_toolbar_button("currentuserbutton")
+
+        #check label
+        label = lambda: self.ubuntusdk.get_object("Header","highscoreslabel").text
+        self.assertThat(label, Eventually(NotEquals("<b>Best scores for all players</b>")))
+
+        #click all users button
+        self.ubuntusdk.click_toolbar_button("allusersbutton")
+
+        #check label again
+        self.assertThat(label, Eventually(Equals("<b>Best scores for all players</b>")))