working

Author: henrikrudstrom

build.bat

@@ -3,5 +3,5 @@ git submodule update
 rm -rf build
 mkdir build
 cd build
-qmake ../shorty
+qmake ../qtqmltest
 make

build.sh

@@ -3,5 +3,5 @@ git submodule update
 rm -rf build
 mkdir build
 cd build
-qmake ../shorty
-make
+qmake ../qtqmltest
+make

loader.qml

@@ -0,0 +1,90 @@
+import QtQuick 2.5
+import QtQuick.Window 2.0
+Window {
+    id: window
+    visible: true
+    minimumWidth: 0
+    minimumHeight: 0
+    maximumHeight: 5000
+    maximumWidth: 10000
+    flags: Qt.FramelessWindowHint
+
+    Timer{
+        //Qt.quit cannot be called onLoaded/Completed
+        id: quitTimer
+        interval: 10
+        onTriggered: {
+            Qt.quit();
+        }
+    }
+
+    property bool loaded: false
+
+
+    Loader{
+        anchors.centerIn: parent
+        id: loader
+        source: "../" + script
+        onLoaded: {
+            window.height = item.height
+            window.width = item.width
+            if(item.hasOwnProperty("start"))
+                item.start()
+
+            //Find tests
+            var tests = []
+            for(var i in item.data){
+                var child = item.data[i]
+                if(child.hasOwnProperty("__isTest")){
+                  child.compareRender = compare
+                  tests.push(child)
+                }
+            }
+            tests.reverse();
+            runTest(tests);
+        }
+
+        //pops one test of the stack and runs it, passes a callback for the next test
+        function runTest(tests){
+            console.log(tests)
+            if(tests.length <= 0){
+                quitTimer.start()
+                return
+            }
+            var test = tests.pop()
+            console.log("TESTNAME: "+ test.name)
+            test.start(function(){
+                console.log("TESTDONE: "+ test.name)
+               runTest(tests)
+            });
+        }
+
+        function compare(tag, render, callback){
+            console.log("compare; ", tag, render, callback)
+            if(typeof render === "function")
+                callback = render;
+            if(render === undefined)
+                render = true;
+
+            //todo: ugly
+            var path = source.toString()
+                .replace("/qml/", "/png/")
+                .replace(".qml", "")
+                //.replace("file:///", "") //only on windows
+                .replace("file://", "")
+            if(tag)
+                path = path + "-" + tag
+
+            if(!render){
+                console.log("LOG: skip render" + path)
+                callback(true)
+                return
+            }
+
+
+            console.log("LOG: render " + path)
+            screenshot.shootFull(path+ ".png", window)
+            callback(true) //doesnt compare in qt only generate image
+        }
+    }
+}

qtqmltest/screenshot.cpp

@@ -42,12 +42,10 @@ bool fileExists(QString path) {
 void Screenshot::shootFull(const QString &name, QQuickWindow *view)
 {
 
-    qDebug() << "Shoot full: " << name;
-    if(fileExists(name)) return;
+    qDebug() << "Shoot: " << name;
+    //if(fileExists(name)) return;
     QImage image = view->grabWindow();
-    qDebug() << "Grabbed";
     image.save(name);
-    qDebug() << "Saved";
 }
 
 void Screenshot::shoot(const QString &name, QQuickWindow *view)

render.js

@@ -2,15 +2,15 @@
  * Created by henrikrudstrom on 29.02.16.
  */
 var fs = require('fs');
-var exec = require("child_process").execFileSync;
-var execAsync = require("child_process").execFile;
+var execFile = require("child_process").execFileSync;
+var exec = require("child_process").execSync;
 var glob = require("glob");
 
 var devPath = __dirname.split("/").pop();
-var loader = "tests/qtloader.qml";
+var loader = "dev/loader.qml";
 var paths = [
-  "tests/Tests/TestCase.qml",
-  "tests/Tests/SimpleRenderTest.qml"
+  "tests/Tests/qml/*.qml",
+  //"tests/Tests/SimpleRenderTest.qml"
 ];
 
 function isRenderTest(file, callback) {
@@ -26,24 +26,31 @@ function isRenderTest(file, callback) {
   });
 
 }
+if(process.argv.length == 2){
+  paths.forEach(function(paths) {
+    glob(paths, function(er, files) {
 
-paths.forEach(function(path) {
-//  glob(path, function(er, files) {
-  //  console.log(path)
-    render(path);
-  //});
-  // glob("tests/**/*.qml", function(er, files) {
-  //   files.forEach(function(file) {
-  //     isRenderTest(file, function() { render(file); });
-  //   });
-  // });
-});
+      files.forEach(function(file) {
+        console.log("Rendering " + file)
+        render(file);
+      });
+    });
+    // glob("tests/**/*.qml", function(er, files) {
+    //   files.forEach(function(file) {
+    //     isRenderTest(file, function() { render(file); });
+    //   });
+    // });
+  });
+} else if (process.argv.length == 3){
+  render(process.argv[2])
+}
 
 
 function render(path) {
   //console.log(path);
   var png = path.replace(".qml", ".png");
-  execRender(devPath + "/bin/shorty", loader, path);
+  execRender(devPath + "/bin/qtqmltest", loader, path);
+  exec("sleep 1")
   // try {
   //   fs.accessSync(png, fs.F_OK);
   // } catch (e) {
@@ -63,10 +70,6 @@ function render(path) {
 }
 
 function execRender(shorty, loader, file){
-  //console.log(shorty, loader, file)
-  //shorty = shorty.replace("/", "\\");
-  //loader = loader.replace("/", "\\");
-  //file = file.replace("/", "\\");
   console.log(shorty, loader, file)
-  exec(shorty, [loader, file]);
+  execFile(shorty, [loader, file]);
 }

simple_screenshot.qml

@@ -1,17 +1,18 @@
-//lupdate_only {
-SOURCES = *.qml \
+DISTFILES = *.qml \
         ../tests/Render/Simple/*.qml \
         ../tests/Render/Async/*.qml \
         ../tests/QtQuick/qml/*.qml \
         ../tests/QMLEngine/qml/*.qml \
         ../tests/Tests/*.qml \
+        ../tests/Tests/qml/*.qml \
+        ../tests/qml/*.qml
         ../tests/*.qml
-//}
 
-DISTFILES += \
-    ../tests/Render/Async/tester.qml \
-    TestCase2.qml \
-    Describe.qml
+}
+
+
+
+