git.iko.soy/unity8
on xenial help sign in
fixed testing
02fa86aNick Dedekind
tests/mocks/QtMultimedia/VideoSurface.qml−2
compare with xenial
unifiedsplit
@@ -35,8 +35,6 @@ Rectangle {
35 cellHeight: units.gu(5)
35 cellHeight: units.gu(5)
36 cellWidth: units.gu(5)
36 cellWidth: units.gu(5)
37
37
38− onModelChanged: console.log("COUNT", model)
39−
40 delegate: Item {
38 delegate: Item {
41 width: units.gu(5)
39 width: units.gu(5)
42 height: units.gu(5)
40 height: units.gu(5)
tests/mocks/QtMultimedia/mediaplayer.cpp+9−6
@@ -59,11 +59,14 @@ MediaPlayer::MediaPlayer(QObject* parent)
59 m_timer.setInterval(100);
59 m_timer.setInterval(100);
60 connect(&m_timer, SIGNAL(timeout()), SLOT(timerEvent()));
60 connect(&m_timer, SIGNAL(timeout()), SLOT(timerEvent()));
61
61
62− connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceRemoved,
62+ connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAboutToBeRemoved,
63− this, [this](const QUrl&) {
63+ this, [this](const QUrl& source) {
64+ MediaDataSource* dataSource = MediaPlayerDataController::instance()->dataForSource(source);
65+ if (!dataSource) return;
66+
64− disconnect(0, &MediaDataSource::durationChanged, this, &MediaPlayer::durationChanged);
67+ disconnect(dataSource, &MediaDataSource::durationChanged, this, &MediaPlayer::durationChanged);
65− disconnect(0, &MediaDataSource::seekableChanged, this, &MediaPlayer::seekableChanged);
68+ disconnect(dataSource, &MediaDataSource::seekableChanged, this, &MediaPlayer::seekableChanged);
66− disconnect(0, &MediaDataSource::availabilityChanged, this, &MediaPlayer::availabilityChanged);
69+ disconnect(dataSource, &MediaDataSource::availabilityChanged, this, &MediaPlayer::availabilityChanged);
67 });
70 });
68
71
69 connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAdded,
72 connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAdded,
@@ -271,8 +274,8 @@ void MediaPlayerDataController::unregisterDataSource(MediaDataSource *dataSource
271{
274{
272 QList<QUrl> keys = m_dataSources.keys(dataSource);
275 QList<QUrl> keys = m_dataSources.keys(dataSource);
273 Q_FOREACH(const QUrl& key, keys) {
276 Q_FOREACH(const QUrl& key, keys) {
277+ Q_EMIT sourceAboutToBeRemoved(key);
274 m_dataSources.remove(key);
278 m_dataSources.remove(key);
275− Q_EMIT sourceRemoved(key);
276 }
279 }
277}
280}
278
281
tests/mocks/QtMultimedia/mediaplayer.h+1−1
@@ -186,7 +186,7 @@ public:
186
186
187Q_SIGNALS:
187Q_SIGNALS:
188 void sourceAdded(const QUrl& source);
188 void sourceAdded(const QUrl& source);
189− void sourceRemoved(const QUrl& source);
189+ void sourceAboutToBeRemoved(const QUrl& source);
190
190
191public:
191public:
192 QHash<QUrl, MediaDataSource*> m_dataSources;
192 QHash<QUrl, MediaDataSource*> m_dataSources;
tests/qmltests/CMakeLists.txt+1−1
@@ -32,7 +32,7 @@ add_qml_test(Components ResponsiveGridView)
32add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
32add_qml_test(Components ResponsiveVerticalJournal IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
33add_qml_test(Components Showable)
33add_qml_test(Components Showable)
34add_qml_test(Components ZoomableImage)
34add_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)
36add_qml_test(Dash Dash)
36add_qml_test(Dash Dash)
37add_qml_test(Dash DashContent)
37add_qml_test(Dash DashContent)
38add_qml_test(Dash Card)
38add_qml_test(Dash Card)
tests/qmltests/Components/tst_MediaServices.qml+9−9
@@ -29,17 +29,17 @@ Rectangle {
29
29
30 property var sourceData: {
30 property var sourceData: {
31 "source": "file:///home/nick/Videos/test-mpeg.ogv",
31 "source": "file:///home/nick/Videos/test-mpeg.ogv",
32− "screenshot": "/home/nick/Pictures/malta.jpg"
32+ "screenshot": Qt.resolvedUrl("../Dash/artwork/avatar.png")
33 }
33 }
34
34
35−// MediaDataSource {
35+ MediaDataSource {
36−// source: root.sourceData["source"]
36+ source: root.sourceData["source"]
37−// duration: 60000
37+ duration: 60000
38−// metaData: {
38+ metaData: {
39−// "title" : "TEST MPEG",
39+ "title" : "TEST MPEG",
40−// "resolution" : { "width": 160, "height": 90 }
40+ "resolution" : { "width": 160, "height": 90 }
41−// }
41+ }
42−// }
42+ }
43
43
44 Item {
44 Item {
45 anchors.fill: parent
45 anchors.fill: parent
tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+1−1
@@ -28,7 +28,7 @@ Rectangle {
28
28
29 property var widgetData0: {
29 property var widgetData0: {
30 "source": "file:///test-video1",
30 "source": "file:///test-video1",
31− "screenshot": "file:///home/nick/Pictures/IMG_20150513_132759.jpg"
31+ "screenshot": Qt.resolvedUrl("../artwork/avatar.png")
32 }
32 }
33
33
34 property var widgetData1: {
34 property var widgetData1: {