Commit Graph

167 Commits

Author SHA1 Message Date
Friedemann Kleint
55c0505a00 QSound/QSoundEffect: Use QFINDTESTDATA to locate test data.
Replace SRCDIR define by QFINDTESTDATA, which is the standard
method of locating test data. Remove apparently unused code path
within QT_QSOUNDEFFECT_USEAPPLICATIONPATH.

Change-Id: Id7120e75af727839ad2d1d2b3ef25c7ef2122fa5
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-01-05 04:01:51 +01:00
Michael Goddard
502d3c8eb3 Restructure the source code a little.
Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-01-05 01:13:44 +01:00
Friedemann Kleint
5dfb698016 QAudioIn/Output-tests: Remove SRCDIR-macro/stabilize.
- Introduce QTemporaryDir to create a temporary directory
  to write the files, preventing file open failures caused
  by left-overs of failed tests.
- Use smart pointers for files and QTemporaryDir to ensure
  that files and the directory are always cleaned up
  at destruction time.

Change-Id: Icfbb331dbdd586012b5787f91c36e164033c4120
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-01-04 03:43:36 +01:00
Michael Goddard
45a3823631 Initialize the mock player state variables.
So valgrind is less grumpy.

Change-Id: I3219fd1eaa2296bc6e158876137e0b79c4d8b714
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-01-04 03:43:22 +01:00
Michael Goddard
f7fdfbe7de Remove a random instantiation of a backend.
Not appropriate for a unit test.

Change-Id: I7b05bb8aa067382b34e30d0602809c9fe56b27ef
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-01-04 03:43:20 +01:00
Michael Goddard
d9dc920393 Remove some test functions that are actually integration tests.
And they're already in the qcamerabackend test.

Change-Id: If3edba9035380372a2e8d46efe1cf41e91ce5f09
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-01-04 03:43:17 +01:00
Mithra Pattison
f9ec11a25e Add new implementation of QSound class
Added a re-implementation of QSound, using functionality derived from
QSoundEffect. QSound API remains the same as the original 4.x version.

It offers both a static interface (with auto resource cleanup on sound
completion), as well as an object instance interface for more detailed
control.

Change-Id: I85c00dd88547f8dea9b1e1ef2da31d2f2e28a172
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-12-30 05:03:45 +01:00
dakovaci
5c099a7e40 SoundEffects System Tests added
Added some soundeffects systems test to the audio systems test

Change-Id: I9f9392a9bee50c11d0ec9d32490b79241e49014a
Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
2011-12-07 05:03:14 +01:00
dakovaci
b470714d19 Edited the Camera systemtest
Just some small editing

Change-Id: I918a259570ef105047015dccfbf27c1be6e5a513
Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
2011-12-07 02:22:27 +01:00
Jason McDonald
3effd6bc12 Remove unused QTRY_WAIT macros.
Change-Id: I8484c19d0458d9ec9a3a621fa0b866258e8212c3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-12-06 08:40:31 +01:00
Jason McDonald
0811215f40 Remove duplicates of QTRY_VERIFY and QTRY_COMPARE.
These macros are now provided by testlib via the QtTest/QtTest header.

Change-Id: I6b499395888268aab315d63404e2b0eed8688615
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-12-06 08:40:25 +01:00
Jason McDonald
3171081d43 Cleanup multimedia unit tests.
Use QTEST_MAIN or QTEST_GUILESS_MAIN instead of equivalent custom main()
functions.  Also collapse each test into a single source file, in line
with most other autotests.

Change-Id: I38c7b6a9eb0ff1c9b8ac44de7d5f40d6ac6c46ea
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-12-05 02:32:37 +01:00
dakovaci
4c834365c6 Add playlist test
Added some playlist tests and edit some audio

Change-Id: I936ef4772be9aebe5baf8f755cedadc93107f9e4
Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
2011-12-02 04:46:13 +01:00
Dmytro Poplavskiy
3319639a6f Allow nested read only maps of QVideoFrame.
It's useful when video frame is accessed from multiple places
like display and encoding.

Change-Id: I8af175c780783216d8b7717cdf0744ad9bc95348
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-11-28 11:56:42 +01:00
Michael Goddard
9bb50446e3 QAudioDeviceInfo is actually an integration test.
It should be separated at some point.

Change-Id: I03adde303eed558d52e06f0afa673252e54c2182
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-11-24 05:06:44 +01:00
Ling Hu
d2a4f632cd Add testDestroyWhileRestartPlaying for qsoundeffect
This covers the potential crash reported by qfeedbackmmk test.

Change-Id: Ib533e80b25c4c7fb291527d62445aaa40960baa0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-11-23 12:49:52 +01:00
Jonas Rabbe
ace3d92006 Export QMediaPluginLoader so it can be used by libqgsttools_p.
Change-Id: I2af6a68646cccaa92ae8b85b67e2095dcfee485e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2011-11-18 03:40:27 +01:00
Jason McDonald
34cdc41a93 Remove SkipMode parameter from QSKIP.
The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.

Task-number: QTBUG-21851, QTBUG-21652
Change-Id: Ib6225572a46eac7881222fdce192750b8b13ee3b
Reviewed-by: Steve Schilz <sschilz@pasco.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-11-10 06:45:27 +01:00
dakovaci
23af917dc5 Radio systemtests
Added some radio functionality to match the qlm radio example

Change-Id: Ie0358c3443121b638db406e095467b18b4d6b57c
Reviewed-by: Daron Andrew Edie
(cherry picked from commit 1e542df82fbcc4e3a8f75537af204f83827a4587)
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-11-10 03:15:41 +01:00
Michael Goddard
e3a8c165ea Rearrange the automatic tests.
Split them into unit and integration tests.  Integration tests really
need to be run on the real platform (not in a VM etc) since they are
somewhat unstable or nonfunctional otherwise.

A few tests were previously broken by QUrl changes and they were repaired.
Removed one test since it was not providing a lot of value.

There are still a number of tests that rely on Q_AUTOTEST_EXPORT symbols.

Change-Id: Ic402abf0af946baa5945075d975b3f584f9ef280
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-11-04 08:19:17 +01:00
Michael Goddard
7dfb883df6 Declare more metatypes and debug operators.
Nearly all of the multimedia metatypes used in the auto tests are
now declared properly, and a large number of the types have debug
operators as well.

Removed the superfluous decls as well.

Change-Id: I42cfe37562db0c71d9811b4577fc326a3326ccc9
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-11-02 02:38:02 +01:00
Friedemann Kleint
6703ebf362 QtMultimedia: Remove qpa-sections from .profiles.
Prepare for removal of the -qpa configure option.

Change-Id: Ibf4be58231d29cd972eb765f32b410e1eb9d7fed
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-11-01 01:40:47 +01:00
Michael Goddard
89b6bcbd96 Declare these metatypes.
Change-Id: I5b10669f2b17f67d95469dc28e99822d7f08280c
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-10-25 06:15:06 +02:00
Sami Nurmenniemi
6aea1a22ee Added RDS functionality to the QRadioTuner/QDeclarativeRadio
Change-Id: I865e3caba82977002cf1f01f1d64ee0a42de77c6
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-10-21 03:40:14 +02:00
Michael Goddard
4be55afa6c Fix debug output test - type is qreal, so can be float or double.
Change-Id: Ica34e3076b186c4e4af4492722c1fe00445d3184
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-10-21 03:39:14 +02:00
Dmytro Poplavskiy
f7d0cc8151 Added testcase to qcamerabackend test CONFIG
To ensure the test case is installed.

Change-Id: I959a1d73e3d8c913c4f15bb9e12b663ca4fb0343
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-10-20 06:48:51 +02:00
Michael Goddard
d414247afe Make the C++ API of QSoundEffect public.
The QML API already was.  The C++ API still needs good documentation,
though.

Change-Id: I669f5ec7dd17d616788d71d77dc906acc0c0279f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2011-10-17 05:10:21 +02:00
Kalle Juhani Lehtonen
90e6c9d1f8 Fix qwavedecoder test data deployment on device
- Device deployment changed to use DEPLOYMENT instead of INSTALLS for
test data files
- Test data deployment target fixed to go under binary
installation directory instead of the build directory

Change-Id: I4b0007f9309767083a4a5dfa6f3dc26f3c36c330
Reviewed-on: http://codereview.qt-project.org/6573
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-10-13 13:04:12 +02:00
Jonas Rabbe
126addddb5 Fixed a couple of failing auto tests.
QDeclarativeAudio test is using a fake backend initialised
to a specific volume. The test was testing against a
different volume.

QMediaPlayerWidgets was trying to include QApplication,
but from the wrong place and was not including QtWidgets
module.

Change-Id: I5ca108a040a4f4bd0d7550268f3a4ef5d790e755
Reviewed-on: http://codereview.qt-project.org/6458
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2011-10-12 04:29:05 +02:00
Michael Goddard
01e1f91e64 Add QNAM tests to wavedecoder as well, to simulate slow sources.
Change-Id: Ic65659bfdf72aea2cea5ae97de50a1e661db189b
Reviewed-on: http://codereview.qt-project.org/6404
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-10-11 08:59:55 +02:00
Michael Goddard
0da05239d2 Rename the parsing error signal to parsingError.
Refactor the error handling code a little.

Change-Id: I717b3aaacb24660b3f26769f19ac718b73106473
Reviewed-on: http://codereview.qt-project.org/6401
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-10-11 08:59:51 +02:00
Michael Goddard
8943111428 Fix the wavedecoder a little.
Handle RIFX and corrupted files better.  Update the autotest so that it
is run properly (and copies files properly in shadow build).  Fix the
gendata script to properly create testdata.

Change-Id: I47b705507bebaef54df2835ec767c6b220c64678
Reviewed-on: http://codereview.qt-project.org/6380
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-10-11 08:59:48 +02:00
Rohan McGovern
e0f306cff9 tests: eliminated usage of qttest_p4.prf
Change-Id: I45f6c818c9dbdcf37c9f5f382b42da9c69618311
Reviewed-on: http://codereview.qt-project.org/6382
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-10-11 06:42:49 +02:00
hawcroft
a93f7b8c8a only corrupt 'data' descriptor nothing else
Change-Id: I5640d13e8c893152e449d348f8bf6c45b899b44d
Reviewed-on: http://codereview.qt-project.org/6283
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-10-11 04:59:16 +02:00
Rohan McGovern
344364e99b tests: eliminated usage of qttest_p4.prf
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.

Change-Id: I3f49fd3b79899eff1d6ad9458143f34419026276
Reviewed-on: http://codereview.qt-project.org/6286
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-10-10 14:44:34 +02:00
hawcroft
12b2988137 Auto test for private class QWaveDecoder
Change-Id: I50ffbc3187ae7d7a7623af3ef7d3fed2975bdbbe
Reviewed-on: http://codereview.qt-project.org/6270
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Sanity-Review: Michael Goddard <michael.goddard@nokia.com>
2011-10-10 09:00:38 +02:00
Michael Goddard
adca03adfd Improve video test coverage and debugging output.
Added a few debug operators for some useful enums, and
added tests for them.  One or two other features not really
tested.

Change-Id: Idffec6ade1d4e05dbf72f3dc47dfc0d01ddddf8b
Reviewed-on: http://codereview.qt-project.org/6201
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-10-07 08:29:57 +02:00
Michael Goddard
03f22bcdaf Rename QtMultimediaKit to QtMultimedia.
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-10-07 06:16:34 +02:00
Gunnar Sletta
4806115e61 Fix widget dependencies for multimediawidget tests and examples.
Change-Id: I9c7600ce2cf7980f923ba038ef122b49add24c37
Reviewed-on: http://codereview.qt-project.org/5286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-22 04:36:10 +02:00
Gunnar Sletta
61c8412577 add QT+=widgets for tests to run
Change-Id: Idccbb5429f1f081d815b4596f0cf0f74c1160f5c
Reviewed-on: http://codereview.qt-project.org/5188
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-20 07:34:19 +02:00
dakovaci
cf8ef332ba Added basic radio system tests
Change-Id: I6f3ef3e3c9f1bb851c2d9f9cbad1aea1df77004f
Reviewed-on: http://codereview.qt-project.org/4945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
2011-09-17 12:19:46 +02:00
dakovaci
054454a775 Added basic camera system tests
Change-Id: I39cefa9207bf45d57cb735cb1a7335b9153d79ee
Reviewed-on: http://codereview.qt-project.org/4944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
2011-09-17 12:19:40 +02:00
dakovaci
81998435ee added basic video system tests
Change-Id: I89cadef1249296c834c4a612f5885439986ff1dc
Reviewed-on: http://codereview.qt-project.org/4943
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
2011-09-17 12:19:32 +02:00
dakovaci
dcee83dfc0 Added basic audio system tests
Change-Id: Ib3cec8adc4cba80a9e91d6fd90c607e99a197c0c
Reviewed-on: http://codereview.qt-project.org/4942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
Reviewed-by: Daron Andrew Edie
2011-09-17 12:19:25 +02:00
Gunnar Sletta
eedcc340f1 Compile with refactor
Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856
Reviewed-on: http://codereview.qt-project.org/4940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-17 03:24:15 +02:00
Michael Goddard
d690596868 Split some of the autotests into widget and non widget parts.
Since the tests are mostly not widget based.

Change-Id: Ic3fa4224b19f2a5c710fd4763b5e645252975c1c
Reviewed-on: http://codereview.qt-project.org/4174
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2011-09-09 02:09:54 +02:00
Michael Goddard
123ffbd783 Clean up the autotest pro files to remove warnings about private headers
Since the tests are bound to a version it's unnecessary.

Change-Id: I7884615179157caa3836face22a4aa431ee5c425
Reviewed-on: http://codereview.qt.nokia.com/4155
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-05 03:27:42 +02:00
Michael Goddard
955c3f21b8 Mark a few tests as insignificant on QPA.
Running with QPA minimal isn't enough for a lot of the video related
tests, and in some cases the backing store code crashes.

Change-Id: I7a09c244fb856397a60c53388b22c3e141737a66
Reviewed-on: http://codereview.qt.nokia.com/4106
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-02 05:24:50 +02:00
Michael Goddard
3bf236cc23 Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
2011-08-30 15:34:30 +10:00
Dmytro Poplavskiy
47a5dd4371 Fixed crash when QCameraImageCapture is deleted before QMediaRecorder.
Change-Id: I3bbb87f03f122378e9367e1f2c0cc5b61fce6ed7
Reviewed-on: http://codereview.qt.nokia.com/3550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-26 06:18:30 +02:00