1 files changed, 29 insertions, 0 deletions
diff --git a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp
index 3baa72281..bcc4acb3a 100644
--- a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp
+++ b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp
@@ -100,6 +100,7 @@ private slots:
     void saturationRendererControl();
 
     void paintRendererControl();
+    void paintSurface();
 
 private:
     void sizeHint_data();
@@ -1609,6 +1610,34 @@ void tst_QVideoWidget::paintRendererControl()
     QCOMPARE(surface->isReady(), true);
 }
 
+void tst_QVideoWidget::paintSurface()
+{
+    QtTestVideoWidget widget;
+    widget.resize(640,480);
+    widget.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
+
+    QVERIFY(widget.videoSurface());
+    auto surface = qobject_cast<QPainterVideoSurface *>(
+            widget.videoSurface());
+    QVERIFY(surface);
+
+    QVideoSurfaceFormat format(QSize(2, 2), QVideoFrame::Format_RGB32);
+    QVERIFY(surface->start(format));
+    QCOMPARE(surface->isActive(), true);
+
+    QVideoFrame frame(sizeof(rgb32ImageData), QSize(2, 2), 8, QVideoFrame::Format_RGB32);
+    frame.map(QAbstractVideoBuffer::WriteOnly);
+    memcpy(frame.bits(), rgb32ImageData, frame.mappedBytes());
+    frame.unmap();
+
+    QVERIFY(surface->present(frame));
+    QCOMPARE(surface->isReady(), false);
+    QTRY_COMPARE(surface->isReady(), true);
+    QCOMPARE(surface->isActive(), true);
+    QCOMPARE(surface->isReady(), true);
+}
+
 QTEST_MAIN(tst_QVideoWidget)
 
 #include "tst_qvideowidget.moc"