Changeset 489f262 for src

Timestamp:

12/31/09 12:24:20 (13 years ago)

Author:

komarma <komarma@…>

Branches:

master, qt5

Children:

d0d0a66

Parents:

20a6010

Message:

Fixing datetime conversion

Location:

src

Files:

• model/event.h (modified) (2 diffs)
• orm/ormrecord.h (modified) (1 diff)
• test/model/eventtest.cpp (modified) (3 diffs)

src/model/event.h

@@ -31 +31 @@
     int duration() const { return value("duration").toInt(); }
     int activityId() const { return value("xid_activity").toInt(); }
-    int typeId() const { return value("type").toInt(); }
-    int languageId() const { return value("language").toInt(); }
+    QString type() const { return value("type").toString(); }
+    QString language() const { return value("language").toString(); }
 
     void setId(int id) { setValue("id", id); }
@@ -39 +39 @@
     void setDuration(int duration) { setValue("duration", duration); }
     void setActivityId(int activityId) { setValue("xid_activity", activityId); }
-    void setTypeId(int typeId) { setValue("type", typeId); }
-    void setLanguageId(int languageId) { setValue("language", languageId); }
+    void setType(const QString& type) { setValue("type", type); }
+    void setLanguage(const QString& language) { setValue("language", language); }
 
 friend class EventTest;

src/orm/ormrecord.h

@@ -149 +149 @@
 QVariant OrmRecord<T>::convertToC(QVariant value, QVariant::Type colType)
 {
-    if (colType == QVariant::DateTime &&
-        (value.type() == QVariant::UInt || value.type() == QVariant::Int))
+    if (colType == QVariant::DateTime && value.canConvert<uint>())
     {
         QDateTime date;
+        date.setTimeSpec(Qt::UTC);
         date.setTime_t(value.toUInt());
         return date;

src/test/model/eventtest.cpp

@@ -19 +19 @@
 {
     Event event = Event::getById(500, 1);
+
     QCOMPARE(event.id(), 500);
-    QCOMPARE(event.start(), QDateTime::fromString("Sat Feb 7 11:30:00 2009"));
+    QCOMPARE(event.start(), QDateTime(QDate(2009, 2, 7), QTime(11, 30, 0), Qt::UTC));
     QCOMPARE(event.activityId(), 123);
 
     // !!! TODO: typeId and languageId
-    QCOMPARE(event.typeId(), 0);
-    QCOMPARE(event.languageId(), 0);
+    QCOMPARE(event.type(), QString("Podium"));
+    QCOMPARE(event.language(), QString("English"));
 }
 
@@ -37 +38 @@
     event.setDuration(30);
     event.setActivityId(40);
-    event.setTypeId(50);
-    event.setLanguageId(60);
+    event.setType(QString("type"));
+    event.setLanguage(QString("language"));
 
     QCOMPARE(event.id(), 10);
@@ -45 +46 @@
     QCOMPARE(event.duration(), 30);
     QCOMPARE(event.activityId(), 40);
-    QCOMPARE(event.typeId(), 50);
-    QCOMPARE(event.languageId(), 60);
+    QCOMPARE(event.type(), QString("type"));
+    QCOMPARE(event.language(), QString("language"));
 }
-
 
 void EventTest::hydrate()