Merge lp:~dobey/ubuntuone-credentials/qdatetime-valid into lp:ubuntuone-credentials

[dobey]

Add new ctor for Token to accept created/updated date strings.
Use the new ctor when creating the token from the REST response.
Turn the date string returned from the server into an ISO string for parsing.
Add more tests.

[Alejandro J. Cura (alecu)]

Please refactor the parsing of the date to a function, and unit test the date parsing only on it.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~dobey/ubuntuone-credentials/qdatetime-valid]

145. By dobey on 2014-09-09

Abstract ISO date conversion to separate method.

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'debian/libubuntuoneauth-2.0-0.symbols'
--- debian/libubuntuoneauth-2.0-0.symbols	2014-08-18 17:54:29 +0000
+++ debian/libubuntuoneauth-2.0-0.symbols	2014-09-09 13:53:37 +0000
@@ -106,8 +106,9 @@
  (c++)"UbuntuOne::Token::buildTokenName()@Base" 13.08
  (c++)"UbuntuOne::Token::toQuery()@Base" 13.08
  (c++)"UbuntuOne::Token::fromQuery(QString)@Base" 13.08
- (c++)"UbuntuOne::Token::Token(QString, QString, QString, QString)@Base" 13.08
- (c++)"UbuntuOne::Token::Token(QString, QString, QString, QString)@Base" 13.08
+ (c++)"UbuntuOne::Token::dateStringToISO(QString)@Base" 14.04+14.10.20140908
+ (c++)"UbuntuOne::Token::Token(QString, QString, QString, QString)@Base" 13.08
+ (c++)"UbuntuOne::Token::Token(QString, QString, QString, QString, QString, QString)@Base" 14.04+14.10.20140908
  (c++)"UbuntuOne::Token::~Token()@Base" 13.08
  (c++)"UbuntuOne::Token::created() const@Base" 14.04+14.10.20140818
  (c++)"UbuntuOne::Token::updated() const@Base" 14.04+14.10.20140818

=== modified file 'libubuntuoneauth/ssoservice.cpp'
--- libubuntuoneauth/ssoservice.cpp	2014-08-12 20:38:39 +0000
+++ libubuntuoneauth/ssoservice.cpp	2014-09-09 13:53:37 +0000
@@ -145,7 +145,8 @@
     void SSOService::tokenReceived(const OAuthTokenResponse& token)
     {
         Token realToken = Token(token.token_key(), token.token_secret(),
-                                token.consumer_key(), token.consumer_secret());
+                                token.consumer_key(), token.consumer_secret(),
+                                token.date_created(), token.date_updated());
         _keyring->storeToken(realToken, _tempEmail);
     }
 

=== modified file 'libubuntuoneauth/tests/test_token.cpp'
--- libubuntuoneauth/tests/test_token.cpp	2014-08-15 18:44:37 +0000
+++ libubuntuoneauth/tests/test_token.cpp	2014-09-09 13:53:37 +0000
@@ -87,23 +87,72 @@
     Token *token = Token::fromQuery("consumer_key=c&consumer_secret=c_s&name=Name+%40+hostname&token=t&token_secret=t_s&updated=2014-08-11+18%3A40%3A20.777777&created=2014-08-11+18%3A40%3A20.777777");
     QVERIFY(token->isValid());
     QString query = token->toQuery();
-    QVERIFY(query.contains("updated=2014-08-11+18%3A40%3A20.777777"));
-    QVERIFY(query.contains("created=2014-08-11+18%3A40%3A20.777777"));
+    // Dates are converted to ISO when parsed.
+    QVERIFY(query.contains("updated=2014-08-11T18:40:20Z"));
+    QVERIFY(query.contains("created=2014-08-11T18:40:20Z"));
     delete token;
 }
 
 void TestToken::testCreatedParsed()
 {
     Token *token = Token::fromQuery("consumer_key=c&consumer_secret=c_s&name=Name+%40+hostname&token=t&token_secret=t_s&updated=2014-08-11+18%3A40%3A20.777777&created=2014-08-11+18%3A40%3A20.777777");
-    unsigned int expected = 4294967295;
-    QCOMPARE(token->updated().toTime_t(), expected);
+    unsigned int expected = 1407782420;
+    QVERIFY(token->created().isValid());
+    QCOMPARE(token->created().toTime_t(), expected);
     delete token;
 }
 
 void TestToken::testUpdatedParsed()
 {
     Token *token = Token::fromQuery("consumer_key=c&consumer_secret=c_s&name=Name+%40+hostname&token=t&token_secret=t_s&updated=2014-08-11+18%3A40%3A20.777777&created=2014-08-11+18%3A40%3A20.777777");
-    unsigned int expected = 4294967295;
-    QCOMPARE(token->updated().toTime_t(), expected);
-    delete token;
+    unsigned int expected = 1407782420;
+    QVERIFY(token->updated().isValid());
+    QCOMPARE(token->updated().toTime_t(), expected);
+    delete token;
+}
+
+void TestToken::testCreatedMissing()
+{
+    Token *token = Token::fromQuery("consumer_key=c&consumer_secret=c_s&name=Name+%40+hostname&token=t&token_secret=t_s");
+    QVERIFY(token->isValid());
+    QVERIFY(!token->created().isValid());
+    QCOMPARE(token->created().toTime_t(), UINT_MAX);
+    delete token;
+}
+
+void TestToken::testUpdatedMissing()
+{
+    Token *token = Token::fromQuery("consumer_key=c&consumer_secret=c_s&name=Name+%40+hostname&token=t&token_secret=t_s");
+    QVERIFY(token->isValid());
+    QVERIFY(!token->updated().isValid());
+    QCOMPARE(token->updated().toTime_t(), UINT_MAX);
+    delete token;
+}
+
+void TestToken::testNewWithDates()
+{
+    Token *token = new Token("token", "t_secret", "consumer", "c_secret",
+                             "2014-08-11+18%3A40%3A20.777777",
+                             "2014-08-11T18:40:20Z");
+    unsigned int expected = 1407782420;
+
+    QVERIFY(token->isValid());
+    QVERIFY(token->created().isValid());
+    QCOMPARE(token->created().toTime_t(), expected);
+    QVERIFY(token->updated().isValid());
+    QCOMPARE(token->updated().toTime_t(), expected);
+    delete token;
+}
+
+void TestToken::testSSODateToISO()
+{
+    QString in_date{"2014-08-11+18%3A40%3A20.777777"};
+    QString expected{"2014-08-11T18:40:20Z"};
+    QCOMPARE(Token::dateStringToISO(in_date), expected);
+}
+
+void TestToken::testISODateToISO()
+{
+    QString in_date{"2014-08-11T18:40:20Z"};
+    QCOMPARE(Token::dateStringToISO(in_date), in_date);
 }

=== modified file 'libubuntuoneauth/tests/test_token.h'
--- libubuntuoneauth/tests/test_token.h	2014-08-15 18:44:37 +0000
+++ libubuntuoneauth/tests/test_token.h	2014-09-09 13:53:37 +0000
@@ -44,6 +44,12 @@
         void testTimesCached();
         void testCreatedParsed();
         void testUpdatedParsed();
+        void testCreatedMissing();
+        void testUpdatedMissing();
+        void testNewWithDates();
+
+        void testSSODateToISO();
+        void testISODateToISO();
 };
 
 #endif /* _TEST_TOKEN_H_ */

=== modified file 'libubuntuoneauth/token.cpp'
--- libubuntuoneauth/token.cpp	2014-08-15 18:44:37 +0000
+++ libubuntuoneauth/token.cpp	2014-09-09 13:53:37 +0000
@@ -46,6 +46,19 @@
         _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)
+    {
+        _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);
+    }
+
     /**
      * \fn QString Token::toQuery()
      *
@@ -97,7 +110,7 @@
     {
         if (_tokenHash.contains(QStringLiteral(TOKEN_CREATED_KEY))) {
             return QDateTime::fromString(_tokenHash[TOKEN_CREATED_KEY],
-                                         "yyyy-MM-dd+HH'%3A'mm'%3A'ss.zzz");
+                                         Qt::ISODate);
         }
         return QDateTime();
     }
@@ -112,7 +125,7 @@
     {
         if (_tokenHash.contains(QStringLiteral(TOKEN_UPDATED_KEY))) {
             return QDateTime::fromString(_tokenHash[TOKEN_UPDATED_KEY],
-                                         "yyyy-MM-dd+HH'%3A'mm'%3A'ss.zzz");
+                                         Qt::ISODate);
         }
         return QDateTime();
     }
@@ -176,8 +189,11 @@
                 // QUrl::fromPercentEncoding at this point in the code.
                 QString value = pair.at(1);
                 token->_tokenHash[pair.at(0)] = QString(value.replace("+", " ").replace("%40", "@"));
-            } else
+            } else if (pair.at(0) == TOKEN_UPDATED_KEY || pair.at(0) == TOKEN_CREATED_KEY) {
+                token->_tokenHash[pair.at(0)] = dateStringToISO(pair.at(1));
+            } else {
                 token->_tokenHash[pair.at(0)] = pair.at(1);
+            }
         }
 
         return token;
@@ -196,4 +212,16 @@
         return QStringLiteral(TOKEN_ID) + QStringLiteral(TOKEN_SEP) + computer_name;
     }
 
+    /**
+     * \fn QString Token::dateStringToISO(const QString date)
+     *
+     * Convert the date string from SSO server to ISO format, if needed.
+     **/
+    QString Token::dateStringToISO(const QString date)
+    {
+        // Force the date strings to be ISO formattted, not pythonish.
+        // We can force GMT here, as we use it on the server.
+        return QString(date).replace("+", "T").replace("%3A", ":").replace(QRegExp("\\.[0-9]+"), "Z");
+    }
+
 } // namespace UbuntuOne

=== modified file 'libubuntuoneauth/token.h'
--- libubuntuoneauth/token.h	2014-08-15 18:44:37 +0000
+++ libubuntuoneauth/token.h	2014-09-09 13:53:37 +0000
@@ -35,6 +35,9 @@
         Token() {};
         Token(QString token_key, QString token_secret,
               QString consumer_key, QString consumer_secret);
+        Token(QString token_key, QString token_secret,
+              QString consumer_key, QString consumer_secret,
+              QString created_date, QString updated_date);
 
         QString toQuery();
         bool isValid() const;
@@ -47,6 +50,8 @@
         static Token *fromQuery(const QString query);
         static QString buildTokenName();
 
+        static QString dateStringToISO(const QString date);
+
     private:
         QHash<QString, QString> _tokenHash;
     };