summaryrefslogtreecommitdiffstats
path: root/tests/auto/integration
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-04-10 12:42:28 +0200
committerLiang Qi <liang.qi@qt.io>2019-04-10 12:42:28 +0200
commit82fdc8913483dd352ae2c326dd358fe9ff8f3f66 (patch)
tree5bc321569aa2ba0821a04b0b439edd549ded6512 /tests/auto/integration
parentf787689e74dee63c55f2731683a4ede752fd9e44 (diff)
parentc8716f68feb5a38473cbd54972b9a9f095e9e24d (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp Done-with: Val Doroshchuk <valentyn.doroshchuk@qt.io> Change-Id: I745dd948c1e98180115f85c17bef802351bbdb6b
Diffstat (limited to 'tests/auto/integration')
-rw-r--r--tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp15
-rw-r--r--tests/auto/integration/qdeclarativevideooutput/main.qml7
-rw-r--r--tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro2
-rw-r--r--tests/auto/integration/qdeclarativevideooutput/qml.qrc5
-rw-r--r--tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp21
-rw-r--r--tests/auto/integration/qdeclarativevideooutput_window/main.qml13
-rw-r--r--tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro2
-rw-r--r--tests/auto/integration/qdeclarativevideooutput_window/qml.qrc5
-rw-r--r--tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp16
-rw-r--r--tests/auto/integration/qsoundeffect/qsoundeffect.pro3
-rw-r--r--tests/auto/integration/qsoundeffect/resources.qrc8
11 files changed, 63 insertions, 34 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index b568f38fc..b8d501c12 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -378,7 +378,7 @@ void tst_QCameraBackend::testCameraCapture()
QTRY_VERIFY(!savedSignal.isEmpty());
- QCOMPARE(capturedSignal.size(), 1);
+ QTRY_COMPARE(capturedSignal.size(), 1);
QCOMPARE(capturedSignal.last().first().toInt(), id);
QCOMPARE(errorSignal.size(), 0);
QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError);
@@ -436,7 +436,7 @@ void tst_QCameraBackend::testCaptureToBuffer()
QTRY_VERIFY(!imageAvailableSignal.isEmpty());
QVERIFY(errorSignal.isEmpty());
- QVERIFY(!capturedSignal.isEmpty());
+ QTRY_VERIFY(!capturedSignal.isEmpty());
QVERIFY(!imageAvailableSignal.isEmpty());
QTest::qWait(2000);
@@ -672,9 +672,16 @@ void tst_QCameraBackend::testVideoRecording()
QTRY_COMPARE(recorder.status(), QMediaRecorder::RecordingStatus);
QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status());
QTest::qWait(5000);
+ recorderStatusSignal.clear();
recorder.stop();
- QCOMPARE(recorder.status(), QMediaRecorder::FinalizingStatus);
- QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status());
+ bool foundFinalizingStatus = false;
+ for (auto &list : recorderStatusSignal) {
+ if (list.contains(QVariant(QMediaRecorder::FinalizingStatus))) {
+ foundFinalizingStatus = true;
+ break;
+ }
+ }
+ QVERIFY(foundFinalizingStatus);
QTRY_COMPARE(recorder.status(), QMediaRecorder::LoadedStatus);
QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status());
diff --git a/tests/auto/integration/qdeclarativevideooutput/main.qml b/tests/auto/integration/qdeclarativevideooutput/main.qml
new file mode 100644
index 000000000..e456adf6c
--- /dev/null
+++ b/tests/auto/integration/qdeclarativevideooutput/main.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+import QtMultimedia 5.0
+
+VideoOutput {
+ width: 150
+ height: 100
+}
diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
index e68e87f79..1f3a00b42 100644
--- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
@@ -3,6 +3,8 @@ TARGET = tst_qdeclarativevideooutput
QT += multimedia-private qml testlib quick
CONFIG += testcase
+RESOURCES += qml.qrc
+
SOURCES += \
tst_qdeclarativevideooutput.cpp
diff --git a/tests/auto/integration/qdeclarativevideooutput/qml.qrc b/tests/auto/integration/qdeclarativevideooutput/qml.qrc
new file mode 100644
index 000000000..5f6483ac3
--- /dev/null
+++ b/tests/auto/integration/qdeclarativevideooutput/qml.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>main.qml</file>
+ </qresource>
+</RCC>
diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
index 3059a4641..5b9fdd03c 100644
--- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
@@ -124,7 +124,6 @@ private slots:
private:
QQmlEngine m_engine;
- QByteArray m_plainQML;
// Variables used for the mapping test
QQmlComponent *m_mappingComponent;
@@ -139,17 +138,9 @@ private:
void tst_QDeclarativeVideoOutput::initTestCase()
{
- m_plainQML = \
- "import QtQuick 2.0\n" \
- "import QtMultimedia 5.0\n" \
- "VideoOutput {" \
- " width: 150;" \
- " height: 100;" \
- "}";
-
// We initialize the mapping vars here
m_mappingComponent = new QQmlComponent(&m_engine);
- m_mappingComponent->setData(m_plainQML, QUrl());
+ m_mappingComponent->loadUrl(QUrl("qrc:/main.qml"));
m_mappingSurface = new SurfaceHolder(this);
m_mappingOutput = m_mappingComponent->create();
@@ -175,7 +166,7 @@ tst_QDeclarativeVideoOutput::tst_QDeclarativeVideoOutput()
void tst_QDeclarativeVideoOutput::fillMode()
{
QQmlComponent component(&m_engine);
- component.setData(m_plainQML, QUrl());
+ component.loadUrl(QUrl("qrc:/main.qml"));
QObject *videoOutput = component.create();
QVERIFY(videoOutput != 0);
@@ -204,7 +195,7 @@ void tst_QDeclarativeVideoOutput::fillMode()
void tst_QDeclarativeVideoOutput::flushMode()
{
QQmlComponent component(&m_engine);
- component.setData(m_plainQML, QUrl());
+ component.loadUrl(QUrl("qrc:/main.qml"));
QObject *videoOutput = component.create();
QVERIFY(videoOutput != 0);
@@ -222,7 +213,7 @@ void tst_QDeclarativeVideoOutput::flushMode()
void tst_QDeclarativeVideoOutput::orientation()
{
QQmlComponent component(&m_engine);
- component.setData(m_plainQML, QUrl());
+ component.loadUrl(QUrl("qrc:/main.qml"));
QObject *videoOutput = component.create();
QVERIFY(videoOutput != 0);
@@ -275,7 +266,7 @@ void tst_QDeclarativeVideoOutput::orientation()
void tst_QDeclarativeVideoOutput::surfaceSource()
{
QQmlComponent component(&m_engine);
- component.setData(m_plainQML, QUrl());
+ component.loadUrl(QUrl("qrc:/main.qml"));
QObject *videoOutput = component.create();
QVERIFY(videoOutput != 0);
@@ -361,7 +352,7 @@ void tst_QDeclarativeVideoOutput::surfaceSource()
void tst_QDeclarativeVideoOutput::sourceRect()
{
QQmlComponent component(&m_engine);
- component.setData(m_plainQML, QUrl());
+ component.loadUrl(QUrl("qrc:/main.qml"));
QObject *videoOutput = component.create();
QVERIFY(videoOutput != 0);
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/main.qml b/tests/auto/integration/qdeclarativevideooutput_window/main.qml
new file mode 100644
index 000000000..8866be147
--- /dev/null
+++ b/tests/auto/integration/qdeclarativevideooutput_window/main.qml
@@ -0,0 +1,13 @@
+import QtQuick 2.0
+import QtMultimedia 5.0
+
+Item {
+ width: 200
+ height: 200
+ VideoOutput {
+ objectName: "videoOutput"
+ x: 25; y: 50
+ width: 150
+ height: 100
+ }
+}
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
index 975c1d6d0..82108d220 100644
--- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
+++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
@@ -3,6 +3,8 @@ TARGET = tst_qdeclarativevideooutput_window
QT += multimedia-private qml testlib quick
CONFIG += testcase
+RESOURCES += qml.qrc
+
SOURCES += \
tst_qdeclarativevideooutput_window.cpp
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qml.qrc b/tests/auto/integration/qdeclarativevideooutput_window/qml.qrc
new file mode 100644
index 000000000..5f6483ac3
--- /dev/null
+++ b/tests/auto/integration/qdeclarativevideooutput_window/qml.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>main.qml</file>
+ </qresource>
+</RCC>
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
index dd739d0e3..645b5d3c6 100644
--- a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
@@ -193,22 +193,8 @@ void tst_QDeclarativeVideoOutputWindow::initTestCase()
{
qRegisterMetaType<QDeclarativeVideoOutput::FillMode>();
- const QByteArray qmlSource =
- "import QtQuick 2.0\n"
- "import QtMultimedia 5.0\n\n"
- "Item {"
- " width: 200;"
- " height: 200;"
- " VideoOutput {"
- " objectName: \"videoOutput\";"
- " x: 25; y: 50;"
- " width: 150;"
- " height: 100;"
- " }"
- "}";
-
QQmlComponent component(&m_engine);
- component.setData(qmlSource, QUrl());
+ component.loadUrl(QUrl("qrc:/main.qml"));
m_rootItem.reset(qobject_cast<QQuickItem *>(component.create()));
m_videoItem = m_rootItem->findChild<QQuickItem *>("videoOutput");
diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
index 8ec2e458a..868346a2e 100644
--- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro
+++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
@@ -14,3 +14,6 @@ unix:!mac {
}
TESTDATA += test.wav
+
+RESOURCES += \
+ resources.qrc
diff --git a/tests/auto/integration/qsoundeffect/resources.qrc b/tests/auto/integration/qsoundeffect/resources.qrc
new file mode 100644
index 000000000..24700560d
--- /dev/null
+++ b/tests/auto/integration/qsoundeffect/resources.qrc
@@ -0,0 +1,8 @@
+<RCC>
+ <qresource prefix="/">
+ <file>test.wav</file>
+ <file>test_corrupted.wav</file>
+ <file>test_tone.wav</file>
+ <file>test24.wav</file>
+ </qresource>
+</RCC>