4 files changed, 84 insertions, 2 deletions
diff --git a/tests/auto/qmltest/selftests/BLACKLIST b/tests/auto/qmltest/selftests/BLACKLIST
new file mode 100644
index 0000000000..ffce42e4c0
--- /dev/null
+++ b/tests/auto/qmltest/selftests/BLACKLIST
@@ -0,0 +1,13 @@
+# Blacklist for testing
+[SelfTests::test_blacklisted_fail]
+*
+[SelfTests::test_blacklistWithData:test2]
+*
+# QTBUG-53793: seems to be failing on Linux a little too often...
+[tst_grabImage::test_equals]
+linux
+[tst_grabImage::test_sizeProps]
+linux
+[tst_grabImage::test_save]
+linux
+
diff --git a/tests/auto/qmltest/selftests/selftests.pro b/tests/auto/qmltest/selftests/selftests.pro
new file mode 100644
index 0000000000..a7938e7003
--- /dev/null
+++ b/tests/auto/qmltest/selftests/selftests.pro
@@ -0,0 +1 @@
+CONFIG += qmltestcase
diff --git a/tests/auto/qmltest/selftests/tst_grabImage.qml b/tests/auto/qmltest/selftests/tst_grabImage.qml
index 1748030f14..7ce7e93a07 100644
--- a/tests/auto/qmltest/selftests/tst_grabImage.qml
+++ b/tests/auto/qmltest/selftests/tst_grabImage.qml
@@ -1,5 +1,6 @@
 /****************************************************************************
 **
+** Copyright (C) 2017 Crimson AS <info@crimson.no>
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -35,7 +36,7 @@ TestCase {
     when: windowShown
 
     function test_equals() {
-        var rect = Qt.createQmlObject("import QtQuick 2.0; Rectangle { color: 'red'; width: 10; height: 10; }", testCase);
+        var rect = createTemporaryQmlObject("import QtQuick 2.0; Rectangle { color: 'red'; width: 10; height: 10; }", testCase);
         verify(rect);
         var oldImage = grabImage(rect);
         rect.width += 10;
@@ -45,9 +46,66 @@ TestCase {
         oldImage = grabImage(rect);
         // Don't change anything...
         newImage = grabImage(rect);
-        verify(newImage.equals(oldImage));
+        try {
+            compare(newImage.size, oldImage.size);
+            verify(newImage.equals(oldImage));
+        } catch (ex) {
+            oldImage.save("tst_grabImage_test_equals_oldImage.png")
+            newImage.save("tst_grabImage_test_equals_newImage.png")
+            throw ex;
+        }
 
         verify(!newImage.equals(null));
         verify(!newImage.equals(undefined));
     }
+
+    function test_sizeProps() {
+        var rect = createTemporaryQmlObject("import QtQuick 2.0; Rectangle { color: 'red'; width: 10; height: 20; }", testCase);
+        var image = grabImage(rect);
+
+        try {
+            compare(image.width, 10)
+            compare(image.height, 20)
+            compare(image.size, Qt.size(10, 20))
+        } catch (ex) {
+            image.save("tst_grabImage_test_sizeProps.png")
+            throw ex;
+        }
+    }
+
+    function test_save() {
+        var rect = createTemporaryQmlObject("import QtQuick 2.0; Rectangle { color: 'red'; width: 10; height: 20; }", testCase);
+        var grabbedImage = grabImage(rect);
+        grabbedImage.save("tst_grabImage_test_save.png")
+
+        // Now try to load it
+        var url = Qt.resolvedUrl("tst_grabImage_test_save.png")
+        var image = createTemporaryQmlObject("import QtQuick 2.0; Image { source: \"" + url + "\" }", testCase);
+        tryCompare(image, "status", Image.Ready)
+        var grabbedImage2 = grabImage(image);
+
+        try {
+            verify(grabbedImage2.equals(grabbedImage))
+        } catch (ex) {
+            grabbedImage2.save("tst_grabImage_test_save2.png")
+            throw ex;
+        }
+    }
+
+    function test_saveThrowsWhenFailing() {
+        var rect = createTemporaryQmlObject("import QtQuick 2.0; Rectangle { color: 'red'; width: 10; height: 20; }", testCase);
+        var grabbedImage = grabImage(rect);
+        var didThrow = false;
+
+        try {
+            // Format doesn't exist, so this will throw
+            grabbedImage.save("tst_grabImage_test_saveThrowsWhenFailing.never-gonna-give-you-up");
+        } catch (ex) {
+            didThrow = true;
+        }
+
+        if (!didThrow) {
+            fail("save() should have thrown, but didn't!")
+        }
+    }
 }
diff --git a/tests/auto/qmltest/selftests/tst_selftests.qml b/tests/auto/qmltest/selftests/tst_selftests.qml
index 439ea7a70d..5555876014 100644
--- a/tests/auto/qmltest/selftests/tst_selftests.qml
+++ b/tests/auto/qmltest/selftests/tst_selftests.qml
@@ -167,6 +167,16 @@ TestCase {
             caught = true
         }
         verify(caught)
+
+        caught = false;
+        try {
+            testCase.verify(true, "foo", "bar")
+        } catch (e) {
+            compare(e.message, "QtQuickTest::fail")
+            compare(functions.failmsg, "More than two arguments given to verify(). Did you mean tryVerify() or tryCompare()?")
+            caught = true
+        }
+        verify(caught)
     }
 
     function test_compare() {