[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/utils/charm
From:       Mirko Boehm <mirko () kde ! org>
Date:       2009-05-13 19:06:48
Message-ID: 1242241608.051909.6330.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967697 by mirko:

 r57267@cutiepie:  mirko | 2009-05-12 23:08:14 +0200
 - one test with mangled data, one with correct data, both work as expected
 - removed one harmless useless statement in Event


 _M            . (directory)  
 M  +1 -1      branches/charm-1.3/Core/Event.cpp  
 A             branches/charm-1.3/Tests/Data/timesheet-utc.xml   \
branches/charm-1.3/Tests/Data/timesheet-3h-east-of-sweden.xml#967696  M  +16 -2     \
branches/charm-1.3/Tests/ImportExportTests.cpp    M  +1 -0      \
branches/charm-1.3/Tests/TestData.qrc  


--- trunk/playground/utils/charm/branches/charm-1.3/Core/Event.cpp #967696:967697
@@ -204,7 +204,7 @@
         QDateTime end = QDateTime::fromString( element.attribute( EventEndAttribute \
                ), Qt::ISODate );
         if ( !end.isValid() ) throw XmlSerializationException( QObject::tr( \
"Event::fromXml: invalid end date" ) );  end.setTimeSpec( Qt::UTC );
-        event.setEndDateTime( end.toLocalTime() );
+        event.setEndDateTime( end );
     }
     event.setComment( element.text() );
     return event;
--- trunk/playground/utils/charm/branches/charm-1.3/Tests/ImportExportTests.cpp \
#967696:967697 @@ -2,6 +2,7 @@
 #include <QDomDocument>
 #include <QFile>
 #include <QtTest/QtTest>
+#include <QDateTime>
 
 #include "Core/Event.h"
 #include "Core/XmlSerialization.h"
@@ -15,15 +16,26 @@
 void ImportExportTests::timesheetImportTest_data()
 {
     QTest::addColumn<QString>( "filename" );
+    QTest::addColumn<QDateTime>( "startDate" );
     QTest::addColumn<int>( "expectedEffort" );
 
-    QTest::newRow( "normalize efforts to UTC" ) << QString::fromAscii( \
":/timesheets/Data/timesheet-3h-east-of-sweden.xml" ) << 17220; +    QTest::newRow( \
"broken timesheets, efforts are not normalized to UTC" ) +        << \
QString::fromAscii( ":/timesheets/Data/timesheet-3h-east-of-sweden.xml" ) +        << \
QDateTime( QDate( 2009, 4, 27 ), QTime(), Qt::UTC ) +        << 0;
+
+    QTest::newRow( "efforts normalized to UTC" )
+        << QString::fromAscii( ":/timesheets/Data/timesheet-utc.xml" )
+        << QDateTime( QDate( 2009, 4, 27 ), QTime(), Qt::UTC )
+        << 17220;
 }
 
 void ImportExportTests::timesheetImportTest()
 {
     QFETCH( QString, filename );
+    QFETCH( QDateTime, startDate );
     QFETCH( int, expectedEffort );
+    const QDateTime endDate( startDate.addDays( 7 ) );
 
     QFile file( filename );
     QVERIFY( file.open( QIODevice::ReadOnly ) );
@@ -41,7 +53,9 @@
         Event event = Event::fromXml( el );
         QVERIFY( event.isValid() );
         events << event;
-        effort += event.duration();
+        if ( event.startDateTime(Qt::UTC ) >= startDate && event.endDateTime() < \
endDate ) { +            effort += event.duration();
+        }
     }
     QCOMPARE( effort, expectedEffort );
 }
--- trunk/playground/utils/charm/branches/charm-1.3/Tests/TestData.qrc #967696:967697
@@ -13,6 +13,7 @@
     </qresource>
     <qresource prefix="/timesheets">
 	<file>Data/timesheet-3h-east-of-sweden.xml</file>
+	<file>Data/timesheet-utc.xml</file>
     </qresource>
 </RCC>
 


[prev in list] [next in list] [prev in thread] [next in thread]