Merge lp:~mikemc/ubuntuone-credentials/add-qml-unit-tests into lp:ubuntuone-credentials

[Mike McCracken]

- Add initial suite of QML unit tests for online-accounts-provider.

- Add initial suite of QML unit tests for online-accounts-provider.

Mostly just covers input validation at this point.

To run, from the top of this branch, do:
mkdir build
cd build
cmake .. # this will not configure it correctly for install, but is fine for the tests
make online-accounts-provider-qmlunit-tests

# Don't relax. The tests are fast!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:68
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/48/
Executed test runs:
    ABORTED: http://10.97.0.26:8080/job/ubuntuone-credentials-saucy-amd64-manual/46/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/48/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/52

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/54/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

I think the qml and javascript files need to have the appropriate copyright comment headers.

review: Needs Fixing

[lp:~mikemc/ubuntuone-credentials/add-qml-unit-tests]

69. By Mike McCracken on 2013-10-11

merge with trunk

70. By Mike McCracken on 2013-10-11

add copyright headers to source files

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/53

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/55/rebuild

review: Approve (continuous-integration)

[lp:~mikemc/ubuntuone-credentials/add-qml-unit-tests]

71. By Mike McCracken on 2013-10-11

remove unused empty functions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/54

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/56/rebuild

review: Approve (continuous-integration)

[lp:~mikemc/ubuntuone-credentials/add-qml-unit-tests]

72. By Mike McCracken on 2013-10-11

standardize on camelCase, sort of

[Leo Arias (elopio)]

Thank you!

review: Approve (code review)

=== modified file 'online-accounts-provider/NewAccount.qml'
--- online-accounts-provider/NewAccount.qml	2013-10-09 13:10:58 +0000
+++ online-accounts-provider/NewAccount.qml	2013-10-11 20:07:00 +0000
@@ -111,6 +111,7 @@
 
     LoginForm {
         id: loginForm
+        objectName: "loginForm"
         visible: true
         
         anchors.left: parent.left
@@ -120,6 +121,7 @@
 
     RegisterForm {
         id: registerForm
+        objectName: "registerForm"
         visible: false
         
         anchors.left: parent.left
@@ -150,6 +152,7 @@
 
     function resetUI() {
         errorLabel.visible = false;
+        errorLabel.text = "";
         emailTextField.text = "";
         loginForm.resetUI()
         registerForm.resetUI();
@@ -253,7 +256,6 @@
     }
 
     function validateInput() {
-        console.debug("in validateInput, emailTextField.text = " + emailTextField.text); 
         formValid = emailTextField.acceptableInput;
         if(!formValid) {
             showError("Please enter a valid email address.");

=== added directory 'online-accounts-provider/tests/unit'
=== added file 'online-accounts-provider/tests/unit/tst_newaccount.qml'
--- online-accounts-provider/tests/unit/tst_newaccount.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/unit/tst_newaccount.qml	2013-10-11 20:07:00 +0000
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 0.1
+import Ubuntu.Components 0.1
+import "utils.js" as Utils
+import "../../"
+
+Item {
+    // The objects
+    NewAccount {
+        id: newAccount
+        anchors.fill: parent
+    }
+
+    Rectangle {
+        /* fake to isolate NewAccount from Main */
+        id: loadingOverlay
+    }
+        
+    
+    TestCase {
+        name: "NewAccountTests"
+        id: testCase
+
+        property var loginForm
+        property var registerForm
+        property var errorLabel
+        property var emailTextField
+        
+        function init() {
+            newAccount.resetUI();
+        }
+        
+        function initTestCase() {
+            loginForm = Utils.findChild(newAccount, "loginForm")
+            registerForm = Utils.findChild(newAccount, "registerForm")
+            errorLabel = Utils.findChild(newAccount, "errorLabel")
+            emailTextField = Utils.findChild(newAccount, "emailTextField")
+        }
+        
+        function test_resetUI() {
+
+            compare(newAccount.currentVisible, loginForm);
+            compare(loginForm.visible, true);
+            compare(errorLabel.visible, false);
+            compare(emailTextField.text, "");
+            compare(newAccount.state, "login");
+
+            var loginForm_pwd = Utils.findChild(loginForm, "loginFormPasswordTextField");
+            compare(loginForm_pwd.text, "");
+
+            compare(loginForm.twoFactorVisible, false);
+        }
+
+        function test_toggleNewUser() {
+
+            compare(loginForm.visible, true);
+            compare(registerForm.visible, false);
+            compare(newAccount.state, "login");
+
+            newAccount.toggleNewUser();
+
+            compare(loginForm.visible, false);
+            compare(registerForm.visible, true);
+            compare(newAccount.state, "register");
+
+        }
+
+        function test_showTwoFactorUI() {
+            compare(loginForm.twoFactorVisible, false);
+            compare(newAccount.state, "login");
+            newAccount.showTwoFactorUI();
+            compare(newAccount.state, "twofactor");
+            compare(loginForm.twoFactorVisible, true);
+        }
+
+        function test_loginValidateInput_data() {
+            var invalidEmail = "invalid email";
+            var validEmail = "[e-mail]";
+            var validPassword = "123456789";
+            var validTwoFactorCode = "123456";
+            return [
+                { shouldShowError: true, tag: "empty input no 2fa", showTwoFactor: false, email: "", password: "", twoFactorCode: ""},
+                { shouldShowError: true, tag: "empty input, with 2fa visible", showTwoFactor: true, email: "", password: "", twoFactorCode: ""},
+                { shouldShowError: true, tag: "invalid email", showTwoFactor: false, email: invalidEmail, password: validPassword, twoFactorCode: ""},      
+                { shouldShowError: true, tag: "invalid email with 2fa", showTwoFactor: true, email: invalidEmail, password: validPassword, twoFactorCode: validTwoFactorCode},
+                { shouldShowError: true, tag: "short pwd", showTwoFactor: false, email: validEmail, password: "123", twoFactorCode: ""},
+                { shouldShowError: true, tag: "short pwd with 2fa", showTwoFactor: true, email: validEmail, password: "123", twoFactorCode: validTwoFactorCode},
+
+                { shouldShowError: false, tag: "OK no 2fa", showTwoFactor: false, email: validEmail, password: validPassword, twoFactorCode: ""},
+                { shouldShowError: false, tag: "OK with 2fa", showTwoFactor: true, email: validEmail, password: validPassword, twoFactorCode: validTwoFactorCode},
+            ]
+        }
+
+        function test_loginValidateInput(data) {
+            newAccount.resetUI();
+            emailTextField.text = data.email;
+            var passwordTextField = Utils.findChild(loginForm, "loginFormPasswordTextField");            
+            passwordTextField.text = data.password;
+            if(data.showTwoFactor) {
+                newAccount.showTwoFactorUI();
+                var twoFactorTextField = Utils.findChild(loginForm, "twoFactorTextField");
+                twoFactorTextField.text = data.twoFactorCode;
+            }
+            
+            newAccount.validateInput();
+            compare(errorLabel.visible, data.shouldShowError);
+        }
+
+        function test_registerValidateInput_data() {
+            var invalidEmail = "invalid email";
+            var validEmail = "[e-mail]";
+            var invalidName = "";
+            var validName = "Vlad Name";
+            var validPassword = "123456789";
+            return [
+                { shouldShowError: true, tag: "invalid email", email: "invalid", name: validName, password: validPassword, confirmPassword: validPassword, termsChecked: true},
+                { shouldShowError: true, tag: "empty name", email: validEmail, name: "", password: validPassword, confirmPassword: validPassword, termsChecked: true},
+                { shouldShowError: true, tag: "short pwd", email: validEmail, name: validName, password: "123", confirmPassword: "123", termsChecked: true},
+                { shouldShowError: true, tag: "pwd mismatch", email: validEmail, name: validName, password: validPassword, confirmPassword: "123456789-mismatch", termsChecked: true},
+                { shouldShowError: true, tag: "termsnotchecked", email: validEmail, name: validName, password: validPassword, confirmPassword: "123456789-mismatch", termsChecked: false},
+                { shouldShowError: false, tag: "everything OK", email: validEmail, name: validName, password: validPassword, confirmPassword: validPassword, termsChecked: true},
+            ]
+        }
+
+        function test_registerValidateInput(data) {
+            newAccount.resetUI();
+            newAccount.toggleNewUser();
+            emailTextField.text = data.email;
+            var nameTextField = Utils.findChild(registerForm, "nameTextField");
+            nameTextField.text = data.name;
+            var passwordTextField = Utils.findChild(registerForm, "passwordTextField");
+            passwordTextField.text = data.password;
+            var registerForm_confirm_pwd = Utils.findChild(registerForm, "confirmPasswordTextField");
+            registerForm_confirm_pwd.text = data.confirmPassword;
+            var termsCheckbox = Utils.findChild(registerForm, "termsAndConditionsCheckBox");
+            termsCheckbox.checked = data.termsChecked;
+
+            newAccount.validateInput()
+
+            compare(errorLabel.visible, data.shouldShowError);   
+        }
+    }
+}

=== added file 'online-accounts-provider/tests/unit/utils.js'
--- online-accounts-provider/tests/unit/utils.js	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/unit/utils.js	2013-10-11 20:07:00 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+.pragma library
+
+// Find an object with the given name in the children tree of "obj"
+function findChild(obj,objectName) {
+    var childs = new Array(0);
+    childs.push(obj)
+    while (childs.length > 0) {
+        if (childs[0].objectName == objectName) {
+            return childs[0]
+        }
+        for (var i in childs[0].children) {
+            childs.push(childs[0].children[i])
+        }
+        childs.splice(0, 1);
+    }
+    return undefined;
+}