From 74e5bf5dae4e23f24e1e50fd78465bad7bbfed61 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Tue, 4 Apr 2023 14:13:52 +0200 Subject: 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 --- .../qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 12 ------------ 1 file changed, 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()); -- cgit v1.2.1