Merge lp:~fginther/sudoku-app/wipe-storage-before-testing into lp:sudoku-app

[Francis Ginther]

Wipe local storage before running test.

Wipe local storage before running test.

PLEASE DO NOT APPROVE, USING THIS TO GATHER JENKINS FEEDBACK.

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

FAILED: Continuous integration, rev:114
http://91.189.93.70:8080/job/sudoku-app-ci/15/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/110
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/15
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/15
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/15
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/15

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

review: Needs Fixing (continuous-integration)

=== modified file 'components/SudokuBlocksGrid.qml'
--- components/SudokuBlocksGrid.qml	2013-08-21 12:35:38 +0000
+++ components/SudokuBlocksGrid.qml	2013-08-30 16:17:49 +0000
@@ -1,7 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
-
 import "../js/SudokuCU.js" as SudokuCU
 
 Column {
@@ -36,7 +35,7 @@
     property var solution;
     property bool alreadyCreated: mainView.alreadyCreated;
     property bool checkIfCheating: false;
-    property real blockSize: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/10: units.gu(50)/10;
+    property real blockSize: mainView.width/mainView.height < 0.6 ? mainView.width/10: units.gu(50)/10;
 
     // ********* SCORES ENGINE VARIABLES ***************
 
@@ -216,13 +215,17 @@
             }
         }
         mainView.alreadyCreated = true;
-        gameTimer.restart();
+        if (gameTimer.running == true)
+            gameTimer.restart();
+        else
+            gameTimer.start();
         resetScore();
     }
 
     function checkIfGameFinished() {
         //print (checkIfAllFieldsFilled());
         //print (checkIfAllFieldsCorrect());
+        //print("game finished")
         return checkIfAllFieldsFilled() && checkIfAllFieldsCorrect();
     }
 
@@ -255,6 +258,7 @@
         interval: 1000;
         onTriggered: {
             gameSeconds++;
+            //print(gameSeconds, numberOfActions, numberOfHints, calculateScore())
         }
     }
 
@@ -286,6 +290,9 @@
                 randomnumber += 17;
                 sudokuBlocksGrid.createNewGame(81 - randomnumber);
                 break;
+            case 4:
+                PopupUtils.open(newGameComponent);
+                break;
             }
         }
 
@@ -322,7 +329,7 @@
                         SudokuDialogButton{
                             id: clearButton
                             buttonText: i18n.tr("Clear")
-                            width: mainView.width/mainView.height < 0.6 ? mainView.pageWidth*2/3: units.gu(50)*2/3
+                            width: mainView.width/mainView.height < 0.6 ? mainView.width*2/3: units.gu(50)*2/3
                             size: units.gu(5)
                             //anchors.left: parent.left;
                             //anchors.horizontalCenter: parent
@@ -381,7 +388,8 @@
 
                                         if (checkIfGameFinished()) {
                                             gameFinishedRectangle.visible = true;
-                                            Settings.insertNewScore(currentUserId, sudokuBlocksGrid.calculateScore())
+                                            //Settings.insertNewScore(currentUserId, sudokuBlocksGrid.calculateScore())
+                                            mainView.insertNewGameScore(currentUserId, sudokuBlocksGrid.calculateScore())
                                             gameFinishedText.text = i18n.tr("You are a cheat... \nBut we give you\n")
                                                     + sudokuBlocksGrid.calculateScore()
                                                     + " " + i18n.tr("points.")
@@ -390,19 +398,7 @@
                                             print (sudokuBlocksGrid.numberOfHints)
                                             print (sudokuBlocksGrid.gameSeconds)
                                             print (sudokuBlocksGrid.gameDifficulty)
-                                            var allScores = Settings.getAllScores()
-                                            highscoresModel.clear();
-                                            highscoresHeaderText = i18n.tr("<b>Best scores for all players</b>");
-                                            for(var i = 0; i < allScores.length; i++) {
-                                                var rowItem = allScores[i];
-                                                print("ROW ",rowItem)
-                                                var firstName = Settings.getUserFirstName(rowItem[0]);
-                                                var lastName = Settings.getUserLastName(rowItem[0]);
-                                                //res.push([dbItem.first_name, dbItem.last_name, dbItem.score])
-                                                highscoresModel.append({'firstname': firstName,
-                                                                           'lastname':  lastName,
-                                                                           'score': rowItem[1] });
-                                            }
+
                                             winTimer.restart();
                                         }
                                     }
@@ -413,7 +409,7 @@
 
                         SudokuDialogButton{
                             buttonText: i18n.tr("Cancel")
-                            width: mainView.width/mainView.height < 0.6 ? mainView.pageWidth*2/3: units.gu(50)*2/3
+                            width: mainView.width/mainView.height < 0.6 ? mainView.width*2/3: units.gu(50)*2/3
                             size: units.gu(5)
                             //anchors.left: parent.left;
                             //anchors.horizontalCenter: parent

=== modified file 'components/SudokuButtonsGrid.qml'
--- components/SudokuButtonsGrid.qml	2013-08-21 12:35:38 +0000
+++ components/SudokuButtonsGrid.qml	2013-08-30 16:17:49 +0000
@@ -54,7 +54,7 @@
         buttonText: "0";
         //width: units.gu(5);
         //height: units.gu(5);
-        size: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/10: units.gu(50)/10;
+        size: mainView.width/mainView.height < 0.6 ? mainView.width/10: units.gu(50)/10;
         //color: defaultColor;
         //border.width: 0
         //border.color: defaultBorderColor
@@ -143,6 +143,9 @@
             randomnumber += 17;
             sudokuBlocksGrid.createNewGame(81 - randomnumber);
             break;
+        case 4:
+            PopupUtils.open(newGameComponent);
+            break;
         }
     }
 

=== modified file 'js/localStorage.js'
--- js/localStorage.js	2013-07-09 14:04:43 +0000
+++ js/localStorage.js	2013-08-30 16:17:49 +0000
@@ -1,5 +1,6 @@
 // Database operations file. Borrowed from
 // UbuntuPhoneRedditApp
+//.import QtQuick.LocalStorage 2.0 as LocalStorage
 
 function getDatabase() {
     return LocalStorage.openDatabaseSync("SudokuTouch", "1.0", "StorageDatabase", 1000000);

=== modified file 'sudoku-app.qml'
--- sudoku-app.qml	2013-08-23 14:51:04 +0000
+++ sudoku-app.qml	2013-08-30 16:17:49 +0000
@@ -14,10 +14,7 @@
     objectName: "sudoku"
     applicationName: "sudoku-app"
 
-    property real pageWidth: units.gu(40);
-    property real pageHeight: units.gu(71);
-
-    property real blockDistance: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/200: units.gu(60)/200;
+    property real blockDistance: mainView.width/mainView.height < 0.6 ? mainView.width/200: units.gu(50)/200;
     property bool alreadyCreated: false;
     property bool gridLoaded: false;
     property int currentUserId: -1;
@@ -28,8 +25,8 @@
 
     property int editUserId : -1;
 
-    width: units.gu(40);
-    height: units.gu(71);
+    width: units.gu(41);
+    height: units.gu(70);
 
     //headerColor: sudokuBlocksGrid.headerColor
     //backgroundColor: sudokuBlocksGrid.backgroundColor
@@ -184,6 +181,26 @@
         Settings.setSetting("currentUserId", currentUserId)
     }
 
+    function insertNewGameScore(userId, score) {
+        Settings.insertNewScore(userId, score)
+    }
+
+    function updatehighScores() {
+        var allScores = Settings.getAllScores()
+        highscoresModel.clear();
+        highscoresHeaderText = i18n.tr("<b>Best scores for all players</b>");
+        for(var i = 0; i < allScores.length; i++) {
+            var rowItem = allScores[i];
+            print("ROW ",rowItem)
+            var firstName = Settings.getUserFirstName(rowItem[0]);
+            var lastName = Settings.getUserLastName(rowItem[0]);
+            //res.push([dbItem.first_name, dbItem.last_name, dbItem.score])
+            highscoresModel.append({'firstname': firstName,
+                                       'lastname':  lastName,
+                                       'score': rowItem[1] });
+        }
+    }
+
     function revealHint() {
         if(disableHints.checked)
         {
@@ -245,8 +262,6 @@
     }
 
     function newSize(widthn, heightn) {
-        pageWidth = widthn;
-        pageHeight = heightn;
         width = widthn
         height = heightn
         //print(height," x ", width);
@@ -320,7 +335,7 @@
                         objectName: "easyGameButton"
                         buttonText: i18n.tr("Easy")
                         opacity: 0.8
-                        width: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/4: units.gu(50)/4;
+                        width: mainView.width/mainView.height < 0.6 ? mainView.width/4: units.gu(50)/4;
                         height: width
                         onTriggered: {
                             //print("EASY")
@@ -328,6 +343,7 @@
                             randomnumber += 31;
                             sudokuBlocksGrid.createNewGame(81 - randomnumber);
                             PopupUtils.close(newGameDialogue)
+                            sudokuBlocksGrid.gameDifficulty = 0
                             toolbar.opened = false;
                         }
                     }
@@ -336,7 +352,7 @@
                         objectName: "moderateGameButton"
                         buttonText: i18n.tr("Moderate")
                         opacity: 0.8
-                        width: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/4: units.gu(50)/4;
+                        width: mainView.width/mainView.height < 0.6 ? mainView.width/4: units.gu(50)/4;
                         height: width
                         onTriggered: {
                             //print("EASY")
@@ -344,6 +360,7 @@
                             randomnumber += 26;
                             sudokuBlocksGrid.createNewGame(81 - randomnumber);
                             PopupUtils.close(newGameDialogue)
+                            sudokuBlocksGrid.gameDifficulty = 1
                             toolbar.opened = false;
                         }
                     }
@@ -352,7 +369,7 @@
                         objectName: "hardGameButton"
                         buttonText: i18n.tr("Hard")
                         opacity: 0.8
-                        width: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/4: units.gu(50)/4;
+                        width: mainView.width/mainView.height < 0.6 ? mainView.width/4: units.gu(50)/4;
                         height: width
                         onTriggered: {
                             //print("EASY")
@@ -360,6 +377,7 @@
                             randomnumber += 21;
                             sudokuBlocksGrid.createNewGame(81 - randomnumber);
                             PopupUtils.close(newGameDialogue)
+                            sudokuBlocksGrid.gameDifficulty = 2
                             toolbar.opened = false;
                         }
                     }
@@ -368,7 +386,7 @@
                         objectName: "ultrahardGameButton"
                         buttonText: i18n.tr("Ultra\nHard")
                         opacity: 0.8
-                        width: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/4: units.gu(50)/4;
+                        width: mainView.width/mainView.height < 0.6 ? mainView.width/4: units.gu(50)/4;
                         height: width
                         onTriggered: {
                             //print("EASY")
@@ -376,6 +394,7 @@
                             randomnumber += 17;
                             sudokuBlocksGrid.createNewGame(81 - randomnumber);
                             PopupUtils.close(newGameDialogue)
+                            sudokuBlocksGrid.gameDifficulty = 3
                             toolbar.opened = false;
                         }
                     }
@@ -384,7 +403,7 @@
 
                 SudokuDialogButton{
                     buttonText: i18n.tr("Cancel")
-                    width: mainView.width/mainView.height < 0.6 ? mainView.pageWidth*2/3: units.gu(50)*2/3
+                    width: mainView.width/mainView.height < 0.6 ? mainView.width*2/3: units.gu(50)*2/3
                     size: units.gu(5)
                     buttonColor: sudokuBlocksGrid.dialogButtonColor1
                     textColor: sudokuBlocksGrid.dialogButtonTextColor
@@ -460,6 +479,9 @@
         {
             currentUserId = Settings.getSetting("currentUserId")
         }
+        if (difficultySelector.selectedIndex == 4) {
+            PopupUtils.open(newGameComponent)
+        }
 
     }
 
@@ -502,6 +524,9 @@
                         randomnumber += 17;
                         sudokuBlocksGrid.createNewGame(81 - randomnumber);
                         break;
+                    case 4:
+                        PopupUtils.open(newGameComponent);
+                        break;
                     }
                 }
 
@@ -516,11 +541,11 @@
                 height: units.gu(15);
                 z: 100;
                 visible: false;
-                x: mainView.pageWidth / 2 - width/2;
-                y: mainView.pageHeight / 2 - height/2;
+                //x: mainView.width / 2 - width/2;
+                //y: mainView.weight / 2 - height/2;
                 //anchors.verticalCenter: mainView.verticalCenter;
                 //anchors.horizontalCenter: mainView.verticalCenter;
-                //anchors.centerIn: mainView;
+                anchors.centerIn: parent;
                 //y: units.gu(5);
                 Label {
                     id: gameFinishedText;
@@ -528,6 +553,7 @@
                     color: sudokuBlocksGrid.defaultHintColor;
                     anchors.centerIn: parent;
                     fontSize: "large";
+                    horizontalAlignment: Text.AlignHCenter
                 }
             }
 
@@ -590,17 +616,19 @@
 
                 Grid {
                     id: informationRow;
-                    y: 7*mainView.pageHeight/10;
+                    //y: 7*mainView.pageHeight/10;
                     //x: units.dp(8);
                     //width: mainView.pageWidth - units.dp(8);
                     anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.top: parent.top
+                    anchors.topMargin: 9*sudokuBlocksGrid.blockSize + 35*sudokuBlocksGrid.blockDistance
                     columns: 3
                     columnSpacing: mainView.width/mainView.height < 0.6 ? mainView.width/6 : units.gu(50)/6
                     UbuntuShape {
                         id: redFlag
                         color: sudokuBlocksGrid.defaultNotAllowedColor
-                        width: mainView.width/mainView.height < 0.6 ? 2*mainView.pageWidth/10: 2*units.gu(50)/10
-                        height: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/10: units.gu(50)/10
+                        width: mainView.width/mainView.height < 0.6 ? 2*mainView.width/10: 2*units.gu(50)/10
+                        height: mainView.width/mainView.height < 0.6 ? mainView.width/10: units.gu(50)/10
                         //border.color: defaultBorderColor
                         //radius: "medium"
                         Label {
@@ -620,8 +648,8 @@
                         id: blueFlag
                         color: sudokuBlocksGrid.defaultStartingColor
                         //border.color: defaultBorderColor
-                        width: mainView.width/mainView.height < 0.6 ? 2*mainView.pageWidth/10: 2*units.gu(50)/10
-                        height: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/10: units.gu(50)/10
+                        width: mainView.width/mainView.height < 0.6 ? 2*mainView.width/10: 2*units.gu(50)/10
+                        height: mainView.width/mainView.height < 0.6 ? mainView.width/10: units.gu(50)/10
                         //radius: "medium";
                         Label {
                             id: blueFlagText
@@ -641,8 +669,8 @@
                         id: orangeFlag
                         color: sudokuBlocksGrid.defaultHintColor
                         //border.color: defaultBorderColor
-                        width: mainView.width/mainView.height < 0.6 ? 2*mainView.pageWidth/10: 2*units.gu(50)/10
-                        height: mainView.width/mainView.height < 0.6 ? mainView.pageWidth/10: units.gu(50)/10
+                        width: mainView.width/mainView.height < 0.6 ? 2*mainView.width/10: 2*units.gu(50)/10
+                        height: mainView.width/mainView.height < 0.6 ? mainView.width/10: units.gu(50)/10
                         //radius: "medium";
                         Label {
                             text: i18n.tr("Hinted blocks")
@@ -668,7 +696,7 @@
         Tab {
             id: highscoresTab
             objectName: "highscoresTab"
-            title: i18n.tr("Best Scores")
+            title: i18n.tr("Scores")
             page: Page {
                 tools: ToolbarItems {
                     ToolbarButton {

=== modified file 'tests/autopilot/sudoku_app/tests/__init__.py'
--- tests/autopilot/sudoku_app/tests/__init__.py	2013-07-11 16:46:16 +0000
+++ tests/autopilot/sudoku_app/tests/__init__.py	2013-08-30 16:17:49 +0000
@@ -31,6 +31,7 @@
     local_location = "../../sudoku-app.qml"
 
     def setUp(self):
+        self.clean_db()
         self.pointing_device = Pointer(self.input_device_class.create())
         super(SudokuTestCase, self).setUp()
         if os.path.exists(self.local_location):
@@ -51,6 +52,38 @@
             "--desktop_file_hint=/usr/share/applications/sudoku-app.desktop",
             app_type='qt')
 
+    def find_db(self):
+        dbs_path = os.path.expanduser("~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases/")
+        if not os.path.exists(dbs_path):
+            return None
+
+        files = [ f for f in os.listdir(dbs_path) if os.path.splitext(f)[1] == ".ini" ]
+        for f in files:
+            ini_path = os.path.join(dbs_path, f)
+            with open(ini_path) as ini:
+                for line in ini:
+                    if "=" in line:
+                        key, val = line.strip().split("=")
+                        if key == "Name" and val == "SudokuTouch":
+                            try:
+                                return ini_path.replace(".ini", ".sqlite")
+                            except OSError:
+                                pass
+        return None
+
+    def clean_db(self):
+        path = self.find_db()
+        if path is None:
+            self.launch_and_quit_app()
+            path = self.find_db()
+            if path is None:
+                self.assertNotEquals(path, None)
+
+        try:
+            os.remove(path)
+        except OSError:
+            pass
+
     @property
     def main_window(self):
         return MainWindow(self.app)