--- a/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp	Mon May 03 13:18:40 2010 +0300
@@ -115,20 +115,20 @@
     // been called, it should still be available through lastKnownPosition()
     QDateTime dt = QDateTime::currentDateTime().toUTC();
     proxy->feedUpdate(dt);
-    QTRY_COMPARE(proxy->source()->lastKnownPosition().dateTime(), dt);
+    QTRY_COMPARE(proxy->source()->lastKnownPosition().timestamp(), dt);
 
     QList<QDateTime> dateTimes = createDateTimes(5);
     for (int i=0; i<dateTimes.count(); i++) {
         proxy->source()->requestUpdate();
         proxy->feedUpdate(dateTimes[i]);
-        QTRY_COMPARE(proxy->source()->lastKnownPosition().dateTime(), dateTimes[i]);
+        QTRY_COMPARE(proxy->source()->lastKnownPosition().timestamp(), dateTimes[i]);
     }
 
     proxy->source()->startUpdates();
     dateTimes = createDateTimes(5);
     for (int i=0; i<dateTimes.count(); i++) {
         proxy->feedUpdate(dateTimes[i]);
-        QTRY_COMPARE(proxy->source()->lastKnownPosition().dateTime(), dateTimes[i]);
+        QTRY_COMPARE(proxy->source()->lastKnownPosition().timestamp(), dateTimes[i]);
     }
 }
 
@@ -164,10 +164,10 @@
         if (trigger == StartUpdatesMethod) {
             QTRY_COMPARE(spy.count(), dateTimes.count());
             for (int i=0; i<dateTimes.count(); i++)
-                QCOMPARE(spy.at(i).at(0).value<QGeoPositionInfo>().dateTime(), dateTimes[i]);
+                QCOMPARE(spy.at(i).at(0).value<QGeoPositionInfo>().timestamp(), dateTimes[i]);
         } else if (trigger == RequestUpdatesMethod) {
             QTRY_COMPARE(spy.count(), 1);
-            QCOMPARE(spy.at(0).at(0).value<QGeoPositionInfo>().dateTime(), dateTimes.first());
+            QCOMPARE(spy.at(0).at(0).value<QGeoPositionInfo>().timestamp(), dateTimes.first());
         }
     }
 }
@@ -229,7 +229,9 @@
     QDateTime dt = QDateTime::currentDateTime().toUTC();    
 
     if (m_mode == QNmeaPositionInfoSource::SimulationMode) {
+        // the first sentence primes the simulation
         proxy->feedBytes(QLocationTestUtils::createRmcSentence(dt).toLatin1());
+        proxy->feedBytes(QLocationTestUtils::createRmcSentence(dt.addMSecs(50)).toLatin1());
         proxy->feedBytes(QLocationTestUtils::createRmcSentence(dt.addSecs(1)).toLatin1());
         proxy->feedBytes(QLocationTestUtils::createRmcSentence(dt.addSecs(2)).toLatin1());
         proxy->feedBytes(QLocationTestUtils::createRmcSentence(dt.addSecs(9)).toLatin1());
@@ -238,7 +240,7 @@
 
         for (int j = 0; j < 3; ++j) {
             i = 0;
-            for (; i < 15; ++i) {
+            for (; i < 12; ++i) {
                 QTest::qWait(100);
                 if ((spyUpdate.count() == 1) && (spyTimeout.count() == 0))
                     break;
@@ -251,7 +253,7 @@
         }
        
         i = 0;
-        for (; i < 75; ++i) {
+        for (; i < 72; ++i) {
             QTest::qWait(100);
             if ((spyUpdate.count() == 0) && (spyTimeout.count() == 1))
                 break;
@@ -259,12 +261,13 @@
         QVERIFY((spyUpdate.count() == 0) && (spyTimeout.count() == 1));
         spyTimeout.clear();
 
-        for (; i < 75; ++i) {
+        for (; i < 72; ++i) {
             QTest::qWait(100);
             if ((spyUpdate.count() == 1) && (spyTimeout.count() == 0))
                 break;
         }
         QVERIFY((spyUpdate.count() == 1) && (spyTimeout.count() == 0));
+
     } else {
         QTest::qWait(900);
         // dt + 900    
@@ -324,7 +327,7 @@
         proxy->feedUpdate(dateTimes[i]);
 
     QTRY_COMPARE(spyUpdate.count(), 1);
-    QCOMPARE(spyUpdate[0][0].value<QGeoPositionInfo>().dateTime(), dateTimes.last());
+    QCOMPARE(spyUpdate[0][0].value<QGeoPositionInfo>().timestamp(), dateTimes.last());
 }
 
 void tst_QNmeaPositionInfoSource::startUpdates_waitForValidDateTime()
@@ -348,7 +351,7 @@
     QTRY_COMPARE(spy.count(), dateTimes.count());
 
     for (int i=0; i<spy.count(); i++)
-        QCOMPARE(spy[i][0].value<QGeoPositionInfo>().dateTime(), dateTimes[i]);
+        QCOMPARE(spy[i][0].value<QGeoPositionInfo>().timestamp(), dateTimes[i]);
 }
 
 void tst_QNmeaPositionInfoSource::startUpdates_waitForValidDateTime_data()
@@ -401,7 +404,7 @@
 
     proxy->feedBytes(bytes);
     QTRY_COMPARE(spy.count(), 1);
-    QCOMPARE(spy[0][0].value<QGeoPositionInfo>().dateTime(), dateTimes[0]);
+    QCOMPARE(spy[0][0].value<QGeoPositionInfo>().timestamp(), dateTimes[0]);
 }
 
 void tst_QNmeaPositionInfoSource::requestUpdate_waitForValidDateTime_data()
@@ -427,7 +430,7 @@
     proxy->feedUpdate(dt);
     proxy->source()->requestUpdate();
     QTRY_COMPARE(spyUpdate.count(), 1);
-    QCOMPARE(spyUpdate[0][0].value<QGeoPositionInfo>().dateTime(), dt);
+    QCOMPARE(spyUpdate[0][0].value<QGeoPositionInfo>().timestamp(), dt);
     QCOMPARE(spyTimeout.count(), 0);
     spyUpdate.clear();
 
@@ -437,7 +440,7 @@
     QTest::qWait(300);
     proxy->feedUpdate(dt);
     QTRY_COMPARE(spyUpdate.count(), 1);
-    QCOMPARE(spyUpdate[0][0].value<QGeoPositionInfo>().dateTime(), dt);
+    QCOMPARE(spyUpdate[0][0].value<QGeoPositionInfo>().timestamp(), dt);
     QCOMPARE(spyTimeout.count(), 0);
     spyUpdate.clear();
 
@@ -471,7 +474,7 @@
     proxy->source()->requestUpdate(100);
     proxy->feedUpdate(dt);
     QTRY_COMPARE(spyUpdate.count(), 1);
-    QCOMPARE(spyUpdate[0][0].value<QGeoPositionInfo>().dateTime(), dt);
+    QCOMPARE(spyUpdate[0][0].value<QGeoPositionInfo>().timestamp(), dt);
     QCOMPARE(spyTimeout.count(), 0);
     spyUpdate.clear();
 
@@ -499,7 +502,7 @@
     proxy->feedBytes(bytes);
     QTRY_COMPARE(spy.count(), dateTimes.count());
     for (int i=0; i<dateTimes.count(); i++)
-        QCOMPARE(spy[i][0].value<QGeoPositionInfo>().dateTime(), dateTimes[i]);
+        QCOMPARE(spy[i][0].value<QGeoPositionInfo>().timestamp(), dateTimes[i]);
 }
 
 void tst_QNmeaPositionInfoSource::testWithBadNmea_data()