git.iko.soy/unity8
on xenial help sign in
fixed testing
commit02fa86a6cc7b949e941f3362dc7fdff9ddd43a3c authorNick Dedekind <nick.dedekind@canonical.com> dateWed 27 May 2015, 09:41 (11 years ago) parent0c6a895
6 files changed+21−20
compare with xenial
unifiedsplit
tests/mocks/QtMultimedia/VideoSurface.qml−2 tests/mocks/QtMultimedia/mediaplayer.cpp+9−6 tests/mocks/QtMultimedia/mediaplayer.h+1−1 tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/Components/tst_MediaServices.qml+9−9 tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+1−1
tests/mocks/QtMultimedia/VideoSurface.qml−2
@@ -35,8 +35,6 @@ Rectangle {
3535 cellHeight: units.gu(5)
3636 cellWidth: units.gu(5)
3737
38− onModelChanged: console.log("COUNT", model)
39−
4038 delegate: Item {
4139 width: units.gu(5)
4240 height: units.gu(5)
tests/mocks/QtMultimedia/mediaplayer.cpp+9−6
@@ -59,11 +59,14 @@ MediaPlayer::MediaPlayer(QObject* parent)
5959 m_timer.setInterval(100);
6060 connect(&m_timer, SIGNAL(timeout()), SLOT(timerEvent()));
6161
62− connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceRemoved,
63− this, [this](const QUrl&) {
64− disconnect(0, &MediaDataSource::durationChanged, this, &MediaPlayer::durationChanged);
65− disconnect(0, &MediaDataSource::seekableChanged, this, &MediaPlayer::seekableChanged);
66− disconnect(0, &MediaDataSource::availabilityChanged, this, &MediaPlayer::availabilityChanged);
62+ connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAboutToBeRemoved,
63+ this, [this](const QUrl& source) {
64+ MediaDataSource* dataSource = MediaPlayerDataController::instance()->dataForSource(source);
65+ if (!dataSource) return;
66+
67+ disconnect(dataSource, &MediaDataSource::durationChanged, this, &MediaPlayer::durationChanged);
68+ disconnect(dataSource, &MediaDataSource::seekableChanged, this, &MediaPlayer::seekableChanged);
69+ disconnect(dataSource, &MediaDataSource::availabilityChanged, this, &MediaPlayer::availabilityChanged);
6770 });
6871
6972 connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAdded,
@@ -271,8 +274,8 @@ void MediaPlayerDataController::unregisterDataSource(MediaDataSource *dataSource
271274{
272275 QList<QUrl> keys = m_dataSources.keys(dataSource);
273276 Q_FOREACH(const QUrl& key, keys) {
277+ Q_EMIT sourceAboutToBeRemoved(key);
274278 m_dataSources.remove(key);
275− Q_EMIT sourceRemoved(key);
276279 }
277280}
278281
tests/mocks/QtMultimedia/mediaplayer.h+1−1
@@ -186,7 +186,7 @@ public:
186186
187187Q_SIGNALS:
188188 void sourceAdded(const QUrl& source);
189− void sourceRemoved(const QUrl& source);
189+ void sourceAboutToBeRemoved(const QUrl& source);
190190
191191public:
192192 QHash<QUrl, MediaDataSource*> m_dataSources;
tests/qmltests/CMakeLists.txt+1−1
@@ -32,7 +32,7 @@ add_qml_test(Components ResponsiveGridView)
3232add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
3333add_qml_test(Components Showable)
3434add_qml_test(Components ZoomableImage)
35−add_qml_test(Components MediaServices IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/utils/modules)
35+add_qml_test(Components MediaServices)
3636add_qml_test(Dash Dash)
3737add_qml_test(Dash DashContent)
3838add_qml_test(Dash Card)
tests/qmltests/Components/tst_MediaServices.qml+9−9
@@ -29,17 +29,17 @@ Rectangle {
2929
3030 property var sourceData: {
3131 "source": "file:///home/nick/Videos/test-mpeg.ogv",
32− "screenshot": "/home/nick/Pictures/malta.jpg"
32+ "screenshot": Qt.resolvedUrl("../Dash/artwork/avatar.png")
3333 }
3434
35−// MediaDataSource {
36−// source: root.sourceData["source"]
37−// duration: 60000
38−// metaData: {
39−// "title" : "TEST MPEG",
40−// "resolution" : { "width": 160, "height": 90 }
41−// }
42−// }
35+ MediaDataSource {
36+ source: root.sourceData["source"]
37+ duration: 60000
38+ metaData: {
39+ "title" : "TEST MPEG",
40+ "resolution" : { "width": 160, "height": 90 }
41+ }
42+ }
4343
4444 Item {
4545 anchors.fill: parent
tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+1−1
@@ -28,7 +28,7 @@ Rectangle {
2828
2929 property var widgetData0: {
3030 "source": "file:///test-video1",
31− "screenshot": "file:///home/nick/Pictures/IMG_20150513_132759.jpg"
31+ "screenshot": Qt.resolvedUrl("../artwork/avatar.png")
3232 }
3333
3434 property var widgetData1: {