Merge lp:~carla-sella/sudoku-app/hint_button_test into lp:sudoku-app

[Nicholas Skaggs]

Fixed the test_hint_button test, it used to fail as the hint button on the toolbar was not enabled, and completed it too by clicking on the hints switch in settings tab to enable the hint button on the toolbar.

Fixed the test_hint_button test, it used to fail as the hint button on the toolbar was not enabled, and completed it too by clicking on the hints switch in settings tab to enable the hint button on the toolbar.

[Dinko Osmankovic (dinko-metalac)]

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/sudoku-app-autolanding/5/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-autolanding/5/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-autolanding/5/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-autolanding/5/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-autolanding/5/console

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Jenkins failed the merge because there is a small conflict because of the merge from Adrian this morning. Should be a really easy fix and merge.

review: Needs Fixing

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/sudoku-app-autolanding/6/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-autolanding/6/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-autolanding/6/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-autolanding/6/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-autolanding/6/console

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:85
http://91.189.93.70:8080/job/sudoku-app-ci/6/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/5/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/6/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/6/console
    FAILURE: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/5/console

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

review: Needs Fixing (continuous-integration)

[Dinko Osmankovic (dinko-metalac)]

review: Approve

[Dinko Osmankovic (dinko-metalac)]

After fixing the problem with merge I approved this since jenkins is failing with this.

[David Planella (dpm)]

Dinko: you need to top-approve it for Jenkins to be triggered, I've just done it for you.

=== modified file 'sudoku-app.qml'
--- sudoku-app.qml	2013-07-17 14:35:52 +0000
+++ sudoku-app.qml	2013-07-17 20:18:27 +0000
@@ -533,6 +533,7 @@
                     }
 
                     ListItem.ValueSelector {
+                        objectName: "difficultySelector"
                         id: difficultySelector
                         text: i18n.tr("Difficulty")
                         values: [i18n.tr("Easy"), i18n.tr("Moderate"), i18n.tr("Hard"), i18n.tr("Ultra Hard")]
@@ -591,9 +592,11 @@
                     }
 
                     ListItem.Standard {
+                        objectName: "hintsSwitchClickable"
                         text: i18n.tr("Hints")
                         width: parent.width
                         control: Switch {
+                            objectName: "hintsSwitch"
                             id: disableHints
                             anchors.horizontalCenter: parent.horizontalCenter
                             anchors.verticalCenter: parent.verticalCenter
 
=== modified file 'tests/autopilot/sudoku_app/emulators/main_window.py'
--- tests/autopilot/sudoku_app/emulators/main_window.py	2013-07-11 19:57:30 +0000
+++ tests/autopilot/sudoku_app/emulators/main_window.py	2013-07-17 20:18:27 +0000
@@ -32,3 +32,22 @@
 
     def get_number_dialog(self):
         return self.app.select_single("Dialog", objectName="picknumberscreen")
+
+    def get_hints_switch(self):
+        return self.app.select_single("CheckBox", objectName="hintsSwitch")
+
+    #clicking on this works instead on  the previous one (get_hints_switch) it doesn't(but the previous
+    #has the clicked property so I am using both
+    def get_hints_switchClickable(self):
+        return self.app.select_single("Standard", objectName="hintsSwitchClickable")
+
+    def get_difficulty_selector(self):
+        return self.app.select_single("ValueSelector", objectName="difficultySelector")
+
+    def get_difficulty_selector_labelvisual(self):
+        labelvisual = self.get_difficulty_selector()
+        labelvisualList = labelvisual.select_many("LabelVisual", text="Easy")
+        return labelvisualList
+
+
+
 
=== modified file 'tests/autopilot/sudoku_app/tests/test_sudoku.py'
--- tests/autopilot/sudoku_app/tests/test_sudoku.py	2013-07-16 16:50:40 +0000
+++ tests/autopilot/sudoku_app/tests/test_sudoku.py	2013-07-17 20:18:27 +0000
@@ -86,8 +86,8 @@
 
         #check label again
         self.assertThat(label, Eventually(Equals("<b>Best scores for all players</b>")))
-        
-	def test_enter_and_cancel(self):
+
+    def test_enter_and_cancel(self):
         #find the first button that has a blank value
         gridButtons = self.main_window.get_blank_inputs()
         gridButton = gridButtons[0]
@@ -127,6 +127,7 @@
 
         #check the value to ensure it worked
         self.assertThat(buttonValue, Eventually(Equals("4")))
+<<<<<<< TREE
         
 	def test_new_game_button(self):
 		self.ubuntusdk.click_toolbar_button("newgamebutton")
@@ -186,3 +187,56 @@
 
         
 		
+=======
+
+    def test_new_game_button(self):
+        self.ubuntusdk.click_toolbar_button("newgamebutton")
+
+        number_of_hints = lambda: self.app.select_single(objectName="blockgrid").numberOfHints
+        number_of_actions = lambda: self.app.select_single(objectName="blockgrid").numberOfActions
+        game_seconds = lambda: self.app.select_single(objectName="blockgrid").gameSeconds
+
+        self.assertThat(number_of_hints, Eventually(Equals(0)))
+        self.assertThat(number_of_actions, Eventually(Equals(0)))
+        self.assertThat(game_seconds, Eventually(Equals(0)))
+
+    def test_hint_button(self):
+        #open settings tab
+        self.open_and_check_settings_tab()
+
+        #click on hints switch to enalbe hints toolbar button
+        hintsSwitchClickable = self.main_window.get_hints_switchClickable()
+        lambda: self.assertThat(hintsSwitchClickable.text, Eventually(Equals("Hints")))
+
+        #turn on (by clicking on it) hints switch if not already
+        hintsSwitch = self.main_window.get_hints_switch()
+        lambda: self.assertThat(hintsSwitch.id, Eventually(Equals("disableHints")))
+        if hintsSwitch.checked == False:
+           self.pointing_device.click_object(hintsSwitchClickable)
+
+        #verify hints switch is clicked
+        self.assertThat(hintsSwitch.checked, Eventually(Equals(True)))
+
+        # exit settings tab by clicking on sudoku tab
+        self.ubuntusdk.switch_to_tab(0)
+
+        #verify settings sudoku tab is open
+        tabName = lambda: self.ubuntusdk.get_object("Tab","Sudoku")
+        #self.assertThat(tabName, Eventually(NotEquals(None)))
+
+        #click on hint button on tuolbar
+        self.ubuntusdk.click_toolbar_button("hintbutton")
+        gridButtons = self.main_window.get_blank_inputs()
+
+        number_of_hints = lambda: self.app.select_single(objectName="blockgrid").numberOfHints
+        self.assertThat(number_of_hints, Eventually(Equals(1)))
+
+    def open_and_check_settings_tab(self):
+        #click on settings tab so to enable the hints button
+        self.ubuntusdk.switch_to_tab(2)
+
+        #verify settings tab is open
+        tabName = lambda: self.ubuntusdk.get_object("Tab","settingsTab")
+        self.assertThat(tabName, Eventually(NotEquals(None)))
+
+>>>>>>> MERGE-SOURCE