X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=zouba%2Ftests%2Fut_route%2Fut_route.cpp;h=ed4cb457da24c8f15da2df18f0d8346ce3113a26;hb=1b2829989f74c2445a5388a5d95a734e48a95352;hp=bb3409247b9d683fe51cfa39e2502c0b9fc9faeb;hpb=dc139290c3f16ad5d162defc0815c64da4f64d98;p=ptas diff --git a/zouba/tests/ut_route/ut_route.cpp b/zouba/tests/ut_route/ut_route.cpp index bb34092..ed4cb45 100644 --- a/zouba/tests/ut_route/ut_route.cpp +++ b/zouba/tests/ut_route/ut_route.cpp @@ -3,340 +3,7 @@ #include #include "ut_route.h" -QByteArray sampleInput( -"\ -\ -\ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -\ -" -); +#include "ut_sampleinput.h" void Ut_Route::init() { @@ -359,15 +26,41 @@ void Ut_Route::cleanupTestCase() void Ut_Route::testParseReply() { - QList routeData = m_subject->parseReply( sampleInput ); + QFETCH(QByteArray, xmlInput); + QFETCH(QList, expectedResults); - QVERIFY( routeData.count()==3 ); - QCOMPARE( routeData.at(0).lineCode, QString( "65A" ) ); - QCOMPARE( routeData.at(0).arrivalTime, QString( "18:20" ) ); - QCOMPARE( routeData.at(1).lineCode, QString( "102T" ) ); - QCOMPARE( routeData.at(1).arrivalTime, QString( "18:26" ) ); - QCOMPARE( routeData.at(2).lineCode, QString( "110T" ) ); - QCOMPARE( routeData.at(2).arrivalTime, QString( "18:34" ) ); + QList routeData = m_subject->parseReply( xmlInput ); + + QCOMPARE( routeData.count(), expectedResults.count() ); + + for( int index=0; index("xmlInput"); + QTest::addColumn< QList >("expectedResults"); + + QTest::newRow("single route") + << sampleInput[0] + << ( QList() + << RouteData( "65A", "18:20" ) + << RouteData( "102T", "18:26" ) + << RouteData( "110T", "18:34" ) + ); + + QTest::newRow("route with bus change") + << sampleInput[1] + << ( QList() + << RouteData( "111", "08:18" ) + << RouteData( "111", "08:33" ) + << RouteData( "111T", "08:34" ) + << RouteData( "111", "08:50" ) + << RouteData( "111", "09:07" ) + ); } void Ut_Route::testSetFromLocation()