Fix tests

Author: rectalogic

.github/workflows/ci.yml

@@ -74,13 +74,15 @@ jobs:
           export UBUNTU=${{ matrix.ubuntu }}
           export TAG=ghcr.io/rectalogic/renderwindow:${UBUNTU}-${{ github.ref_name }}
           builders/Linux/docker-run.sh
+          builders/Linux/docker-run.sh /renderwindow/builders/renderwindow-test.sh --verbose
       - name: Build renderwindow vulkan
         if: matrix.ubuntu == 'noble'
         run: |
           export TARGET=vulkan
           export UBUNTU=${{ matrix.ubuntu }}
           export TAG=ghcr.io/rectalogic/renderwindow:${UBUNTU}-${{ github.ref_name }}
           builders/Linux/docker-run.sh
+          builders/Linux/docker-run.sh /renderwindow/builders/renderwindow-test.sh --verbose
       - name: Archive
         id: archive
         if: github.ref_type == 'tag' && matrix.ubuntu == 'noble'
@@ -127,6 +129,7 @@ jobs:
       - name: Build renderwindow
         run: |
           builders/renderwindow-build.sh
+          builders/renderwindow-test.sh --verbose
       - name: Archive
         id: archive
         if: github.ref_type == 'tag'

MediaFX/RenderWindow/render_window.cpp

@@ -45,7 +45,8 @@ RenderWindow::RenderWindow()
     m_isValid = true;
 }
 
-RenderWindow::~RenderWindow() {
+RenderWindow::~RenderWindow()
+{
     if (m_animationDriver)
         m_animationDriver->uninstall();
 }

tests/CMakeLists.txt

@@ -3,6 +3,7 @@
 
 find_package(Qt6 REQUIRED COMPONENTS Test)
 
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 qt_add_executable(tst_render tst_render.cpp)

tests/Render.qml

@@ -2,19 +2,18 @@ import QtQuick
 import MediaFX.RenderWindow
 
 RenderWindow {
-    width: 160
-    height: 160
+    width: 100
+    height: 100
 
     Rectangle {
-        width: 100
-        height: 100
+        width: 60
+        height: 40
         color: "green"
         anchors.centerIn: parent
         RotationAnimation on rotation {
-            loops: Animation.Infinite
-            duration: 2000
+            duration: 1000
             from: 0
-            to: 360
+            to: 90
         }
     }
 }

tests/fixtures/render-0.png

@@ -4,38 +4,39 @@
 #include <QByteArray>
 #include <QImage>
 #include <QObject>
+#include <QQmlApplicationEngine>
 #include <QSize>
 #include <QString>
 #include <QWindow>
-#include <QtTest>
 #include <QtCore>
-#include <QQmlApplicationEngine>
+#include <QtTest>
 using namespace Qt::Literals::StringLiterals;
 
 class tst_Render : public QObject {
     Q_OBJECT
 
 public slots:
-    void onCreated(QObject *object, const QUrl &url)
+    void onCreated(QObject* object, const QUrl& url)
     {
         QVERIFY(object);
-        QWindow *window = qobject_cast<QWindow*>(object);
+        QWindow* window = qobject_cast<QWindow*>(object);
         QSize size = window->size();
-        QByteArray data;
-        for (int i = 0; i < 5; i++) {
+        for (int i = 0; i < 5; i++) { // NOLINT
+            QByteArray data;
             QMetaObject::invokeMethod(object, "render",
                 Q_RETURN_ARG(QByteArray, data),
-                Q_ARG(qint64, i * 500));
+                Q_ARG(qint64, static_cast<qint64>(i * 250)));
             QVERIFY(!data.isNull());
-            QImage image(reinterpret_cast<const uchar*>(data.constData()), size.width(), size.height(), QImage::Format_RGBA8888);
-            //XXX specify directory
-            image.save(u"render-%1.png"_s.arg(i));
+            QImage fixture(QFINDTESTDATA(u"fixtures/render-%1.png"_s.arg(i)));
+            QImage image(reinterpret_cast<const uchar*>(data.constData()), size.width(), size.height(), QImage::Format_RGBA8888_Premultiplied); // NOLINT
+            // image.save(u"render-%1.png"_s.arg(i));
+            QCOMPARE_EQ(image, fixture.convertToFormat(QImage::Format_RGBA8888_Premultiplied));
+            QTest::qWait(100); // NOLINT
         }
     }
 
-
 private slots:
-    void decode()
+    void render()
     {
         QQmlApplicationEngine engine;
         connect(&engine, &QQmlApplicationEngine::objectCreated, this, &tst_Render::onCreated);