diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2018-03-24 13:21:18 +0100 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2018-04-25 08:10:13 +0000 |
commit | fa8f2114bdb98160921711cd272ab1c9503ab9c3 (patch) | |
tree | cabc28a34c7a15fcfb4a0de50a2d06b680800f06 /tests/auto/integration | |
parent | 08dd127bd7c3900bdb9c73d646a12aae2383a9fb (diff) |
QSound: Allow to play files with qrc schema
It was possible to play resource files only by prefix ":/".
Added support of qrc schema in filenames.
Change-Id: I9e538422828ad2107ab5567d172dca8728cbc64d
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'tests/auto/integration')
-rw-r--r-- | tests/auto/integration/qsound/qsound.pro | 3 | ||||
-rw-r--r-- | tests/auto/integration/qsound/resources.qrc | 5 | ||||
-rw-r--r-- | tests/auto/integration/qsound/tst_qsound.cpp | 22 |
3 files changed, 30 insertions, 0 deletions
diff --git a/tests/auto/integration/qsound/qsound.pro b/tests/auto/integration/qsound/qsound.pro index aa8e5e409..1b552c60e 100644 --- a/tests/auto/integration/qsound/qsound.pro +++ b/tests/auto/integration/qsound/qsound.pro @@ -8,3 +8,6 @@ CONFIG += testcase SOURCES += tst_qsound.cpp TESTDATA += test.wav + +RESOURCES += \ + resources.qrc diff --git a/tests/auto/integration/qsound/resources.qrc b/tests/auto/integration/qsound/resources.qrc new file mode 100644 index 000000000..b54c65040 --- /dev/null +++ b/tests/auto/integration/qsound/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>test.wav</file> + </qresource> +</RCC> diff --git a/tests/auto/integration/qsound/tst_qsound.cpp b/tests/auto/integration/qsound/tst_qsound.cpp index 9fcf79184..dbf75f2e3 100644 --- a/tests/auto/integration/qsound/tst_qsound.cpp +++ b/tests/auto/integration/qsound/tst_qsound.cpp @@ -46,6 +46,9 @@ private slots: void testPlay(); void testStop(); + void testPlayResource_data(); + void testPlayResource(); + void testStaticPlay(); private: @@ -110,6 +113,25 @@ void tst_QSound::testStop() QTRY_VERIFY(sound->isFinished()); } +void tst_QSound::testPlayResource_data() +{ + QTest::addColumn<QString>("filePath"); + + QTest::newRow("prefix :/") << ":/test.wav"; + QTest::newRow("prefix qrc:") << "qrc:test.wav"; + QTest::newRow("prefix qrc:///") << "qrc:///test.wav"; +} + +void tst_QSound::testPlayResource() +{ + QFETCH(QString, filePath); + + QSound snd(filePath); + snd.play(); + QVERIFY(!snd.isFinished()); + QTRY_VERIFY(snd.isFinished()); +} + void tst_QSound::testStaticPlay() { // Check that you hear sound with static play also. |