summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Moskal <bartlomiej.moskal@qt.io>2023-04-04 14:13:52 +0200
committerLars Knoll <lars@knoll.priv.no>2023-04-06 06:07:19 +0000
commit74e5bf5dae4e23f24e1e50fd78465bad7bbfed61 (patch)
tree5e808b1f78b080c9fa2474e51369a7745640dada
parentff3728d95d715f33d8f3f9144e6bb122cf2fc763 (diff)
downloadqtmultimedia-74e5bf5dae4e23f24e1e50fd78465bad7bbfed61.tar.gz
Android-tests: Remove QEXPECT_FAIL from tst_qmediaplayerbackend
Android is using now ffmpeg backend by default. That is why all QEXPECT_FAIL macros can be removed from tst_qmediaplayerbackend. All of them were related to android-backend (QTBUG-96952). For FFmpeg this QEXPECT_FAIL is not valid. Task-number: QTBUG-112173 Pick-to: 6.5 Change-Id: Ic36f8de9852d501837e3459ae8cdb133545075c1 Reviewed-by: Lars Knoll <lars@knoll.priv.no>
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 8f01d30f6..b734acad6 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -1517,9 +1517,6 @@ void tst_QMediaPlayerBackend::isSeekable()
TestVideoSink surface(false);
QMediaPlayer player;
player.setVideoOutput(&surface);
-#ifdef Q_OS_ANDROID
- QEXPECT_FAIL("", "On Android isSeekable() is always set to true due to QTBUG-96952", Continue);
-#endif
QVERIFY(!player.isSeekable());
player.setSource(localVideoFile);
QTRY_VERIFY(player.isSeekable());
@@ -1533,9 +1530,6 @@ void tst_QMediaPlayerBackend::positionAfterSeek()
TestVideoSink surface(false);
QMediaPlayer player;
player.setVideoOutput(&surface);
-#ifdef Q_OS_ANDROID
- QEXPECT_FAIL("", "On Android isSeekable() is always set to true due to QTBUG-96952", Continue);
-#endif
QVERIFY(!player.isSeekable());
player.setSource(localVideoFile);
QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia);
@@ -1560,9 +1554,6 @@ void tst_QMediaPlayerBackend::videoDimensions()
TestVideoSink surface(true);
QMediaPlayer player;
player.setVideoOutput(&surface);
-#ifdef Q_OS_ANDROID
- QEXPECT_FAIL("", "On Android isSeekable() is always set to true due to QTBUG-96952", Continue);
-#endif
QVERIFY(!player.isSeekable());
player.setSource(videoDimensionTestFile);
QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia);
@@ -1582,9 +1573,6 @@ void tst_QMediaPlayerBackend::position()
TestVideoSink surface(true);
QMediaPlayer player;
player.setVideoOutput(&surface);
-#ifdef Q_OS_ANDROID
- QEXPECT_FAIL("", "On Android isSeekable() is always set to true due to QTBUG-96952", Continue);
-#endif
QVERIFY(!player.isSeekable());
player.setSource(localVideoFile);
QTRY_VERIFY(player.isSeekable());