Misc. updates to the lancelot autotest framework

Moving more logic into the protocol and framework, easening
the burden on the autotest implementation.
Implementing several new features in the server and
report, like fuzzy matching and static baselines.

Change-Id: Iaf070918195ae05767808a548f019d09d9d5f8c0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

1 files changed, 23 insertions, 4 deletions

diff --git a/tests/baselineserver/src/report.h b/tests/baselineserver/src/report.h
index 660593784e..918d09d420 100644
--- a/tests/baselineserver/src/report.h
+++ b/tests/baselineserver/src/report.h
@@ -46,6 +46,7 @@
 #include <QTextStream>
 #include <QMap>
 #include <QStringList>
+#include <QSettings>
 
 class BaselineHandler;
 
@@ -55,15 +56,24 @@ public:
     Report();
     ~Report();
 
-    void init(const BaselineHandler *h, const QString &r, const PlatformInfo &p);
+    void init(const BaselineHandler *h, const QString &r, const PlatformInfo &p, const QSettings *s);
     void addItems(const ImageItemList& items);
-    void addMismatch(const ImageItem& item);
+    void addResult(const ImageItem& item);
     void end();
 
+    bool reportProduced();
+
+    int numberOfMismatches();
+    QString summary();
+
     QString filePath();
 
+    QString writeResultsXmlFiles();
+
     static void handleCGIQuery(const QString &query);
 
+    static QString generateThumbnail(const QString &image, const QString &rootDir = QString());
+
 private:
     void write();
     void writeFunctionResults(const ImageItemList &list);
@@ -72,13 +82,17 @@ private:
     void writeHeader();
     void writeFooter();
     QString generateCompared(const QString &baseline, const QString &rendered, bool fuzzy = false);
-    QString generateThumbnail(const QString &image);
 
+    void updateLatestPointer();
+
+    void computeStats();
+
+    bool initialized;
     const BaselineHandler *handler;
     QString runId;
     PlatformInfo plat;
     QString rootDir;
-    QString reportDir;
+    QString baseDir;
     QString path;
     QStringList testFunctions;
     QMap<QString, ImageItemList> itemLists;
@@ -87,6 +101,11 @@ private:
     int numMismatches;
     QTextStream out;
     bool hasOverride;
+    const QSettings *settings;
+
+    typedef QMap<ImageItem::ItemStatus, int> FuncStats;
+    QMap<QString, FuncStats> stats;
+    bool hasStats;
 };
 
 #endif // REPORT_H