Merge lp:~mardy/ubuntuone-credentials/token-valid-1572943 into lp:ubuntuone-credentials

[Alberto Mardegan]

Make Token::isValid() return false on tokens created out of empty strings.

Make Token::isValid() return false on tokens created out of empty strings.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/151/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'libubuntuoneauth/tests/test_token.cpp'
--- libubuntuoneauth/tests/test_token.cpp	2015-12-07 21:17:00 +0000
+++ libubuntuoneauth/tests/test_token.cpp	2016-04-27 08:15:22 +0000
@@ -46,6 +46,13 @@
     delete token;
 }
 
+void TestToken::testTokenEmptyStrings()
+{
+    Token *token = new Token(QString(), QString(), QString(), QString());
+    QVERIFY(!token->isValid());
+    delete token;
+}
+
 void TestToken::testTokenArgs()
 {
     Token *token = new Token("a", "b", "c", "d");
 
=== modified file 'libubuntuoneauth/tests/test_token.h'
--- libubuntuoneauth/tests/test_token.h	2015-12-07 21:17:00 +0000
+++ libubuntuoneauth/tests/test_token.h	2016-04-27 08:15:22 +0000
@@ -39,6 +39,7 @@
         void cleanupTestCase();
 
         void testEmptyToken();
+        void testTokenEmptyStrings();
         void testTokenArgs();
         void testTokenCopy();
 
 
=== modified file 'libubuntuoneauth/token.cpp'
--- libubuntuoneauth/token.cpp	2015-12-07 21:17:00 +0000
+++ libubuntuoneauth/token.cpp	2016-04-27 08:15:22 +0000
@@ -46,21 +46,25 @@
                  QString consumer_key, QString consumer_secret)
     {
         _tokenHash[TOKEN_NAME_KEY] = buildTokenName();
-        _tokenHash[TOKEN_TOKEN_KEY] = token_key;
-        _tokenHash[TOKEN_TOKEN_SEC_KEY] = token_secret;
-        _tokenHash[TOKEN_CONSUMER_KEY] = consumer_key;
-        _tokenHash[TOKEN_CONSUMER_SEC_KEY] = consumer_secret;
+        if (!token_key.isEmpty()) {
+            _tokenHash[TOKEN_TOKEN_KEY] = token_key;
+        }
+        if (!token_secret.isEmpty()) {
+            _tokenHash[TOKEN_TOKEN_SEC_KEY] = token_secret;
+        }
+        if (!consumer_key.isEmpty()) {
+            _tokenHash[TOKEN_CONSUMER_KEY] = consumer_key;
+        }
+        if (!consumer_secret.isEmpty()) {
+            _tokenHash[TOKEN_CONSUMER_SEC_KEY] = consumer_secret;
+        }
     }
 
     Token::Token(QString token_key, QString token_secret,
                  QString consumer_key, QString consumer_secret,
-                 QString created_date, QString updated_date)
+                 QString created_date, QString updated_date):
+        Token(token_key, token_secret, consumer_key, consumer_secret)
     {
-        _tokenHash[TOKEN_NAME_KEY] = buildTokenName();
-        _tokenHash[TOKEN_TOKEN_KEY] = token_key;
-        _tokenHash[TOKEN_TOKEN_SEC_KEY] = token_secret;
-        _tokenHash[TOKEN_CONSUMER_KEY] = consumer_key;
-        _tokenHash[TOKEN_CONSUMER_SEC_KEY] = consumer_secret;
         _tokenHash[TOKEN_CREATED_KEY] = dateStringToISO(created_date);
         _tokenHash[TOKEN_UPDATED_KEY] = dateStringToISO(updated_date);
     }