From 1743a8bea43066c52cf07f6c8a859c3d9ddb65da Mon Sep 17 00:00:00 2001
From: aavit <qt-info@nokia.com>
Date: Wed, 8 Sep 2010 09:09:35 +0200
Subject: Fix: remove baseline checksums before adding rendered

.. otherwise, the comparison will always yield true...

Also a simplification: QList provides default datastreaming ops
---
 tests/arthur/common/baselineprotocol.cpp | 20 --------------------
 tests/arthur/common/baselineprotocol.h   |  5 -----
 tests/auto/lancelot/tst_lancelot.cpp     |  2 +-
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp
index cbead24..7996fff 100644
--- a/tests/arthur/common/baselineprotocol.cpp
+++ b/tests/arthur/common/baselineprotocol.cpp
@@ -129,26 +129,6 @@ QDataStream & operator>> (QDataStream &stream, ImageItem &ii)
     return stream;
 }
 
-QDataStream & operator<< (QDataStream &stream, const QList<quint64> &checkSumList)
-{
-    stream << quint32(checkSumList.count());
-    foreach(quint64 checksum, checkSumList)
-        stream << checksum;
-    return stream;
-}
-
-QDataStream & operator>> (QDataStream &stream, QList<quint64> &checkSumList)
-{
-    quint32 numChecksums;
-    stream >> numChecksums;
-    quint64 checkSum;
-    for (int i=0; i<(int)numChecksums; ++i) {
-        stream >> checkSum;
-        checkSumList.append(checkSum);
-    }
-    return stream;
-}
-
 BaselineProtocol::~BaselineProtocol()
 {
     socket.close();
diff --git a/tests/arthur/common/baselineprotocol.h b/tests/arthur/common/baselineprotocol.h
index 1cd8bb6..5427023 100644
--- a/tests/arthur/common/baselineprotocol.h
+++ b/tests/arthur/common/baselineprotocol.h
@@ -57,15 +57,10 @@ public:
 QDataStream & operator<< (QDataStream &stream, const ImageItem &ii);
 QDataStream & operator>> (QDataStream& stream, ImageItem& ii);
 
-
 Q_DECLARE_METATYPE(ImageItem);
 
-QDataStream & operator<< (QDataStream &stream, const QList<quint64> &checkSumList);
-QDataStream & operator>> (QDataStream &stream, QList<quint64> &checkSumList);
-
 typedef QVector<ImageItem> ImageItemList;
 
-
 class BaselineProtocol
 {
 public:
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp
index b2d5a7b..aba544f 100644
--- a/tests/auto/lancelot/tst_lancelot.cpp
+++ b/tests/auto/lancelot/tst_lancelot.cpp
@@ -246,11 +246,11 @@ void tst_Lancelot::runTestSuite()
 ImageItem tst_Lancelot::render(const ImageItem &item)
 {
     ImageItem res = item;
+    res.imageChecksums.clear();
     QString filePath = scriptsDir + item.scriptName;
     QStringList script = loadScriptFile(filePath);
     if (script.isEmpty()) {
         res.image = QImage();
-        res.imageChecksums.append(0);
     } else if (item.engine == ImageItem::Raster) {
         QImage img(800, 800, item.renderFormat);
         paint(&img, script, QFileInfo(filePath).absoluteFilePath()); // eh yuck (filePath stuff)
-- 
cgit v0.12