adjust unit tests

ddanilov · Jul 20, 2024 · 50eef58 · 50eef58
1 parent 424613d
commit 50eef58
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/tests/TestMainWindow.cpp b/tests/TestMainWindow.cpp
@@ -43,7 +43,7 @@ void TestMainWindow::testTrackFromMedia()
   auto* track = track_control->track();
   QCOMPARE(track->title(), "sound_01");
   QCOMPARE(track->volume(), 0.50);
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) || QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
   QVERIFY(track->isPlaying());
 #endif
 
@@ -54,14 +54,14 @@ void TestMainWindow::testTrackFromMedia()
   QVERIFY(track_control != nullptr);
   QCOMPARE(track->title(), "sound_02");
   QCOMPARE(track->volume(), 0.50);
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) || QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
   QVERIFY(track->isPlaying());
 #endif
 }
 
 void TestMainWindow::testSaveTracksToJson()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
   QSKIP("Test does not work");
 #endif
 
@@ -233,7 +233,7 @@ void TestMainWindow::testLoadTracksFromJson()
   auto* track = track_control->track();
   QCOMPARE(track->title(), "sound_01");
   QCOMPARE(track->volume(), 0.51);
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) || QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
   QVERIFY(track->isPlaying());
 #endif
   //
@@ -249,7 +249,7 @@ void TestMainWindow::testLoadTracksFromJson()
   track = track_control->track();
   QCOMPARE(track->title(), "sound_03");
   QCOMPARE(track->volume(), 0.53);
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) || QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
   QVERIFY(track->isPlaying());
 #endif
 }

diff --git a/tests/TestPlayer.cpp b/tests/TestPlayer.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022-2023 Denis Danilov
+// SPDX-FileCopyrightText: 2022-2024 Denis Danilov
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "Player.h"
@@ -92,7 +92,7 @@ void TestPlayer::testAudioFileDurationZero()
 
 void TestPlayer::testAudioFileBroken()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
   QSKIP("Test does not work");
 #endif
 
@@ -105,7 +105,7 @@ void TestPlayer::testAudioFileBroken()
 
 void TestPlayer::testMediaFileWithoutAudio()
 {
-#if defined Q_OS_WIN
+#if defined Q_OS_WIN && QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
   QSKIP("Test does not work on Windows");
 #endif
 

diff --git a/tests/TestTrack.cpp b/tests/TestTrack.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022-2023 Denis Danilov
+// SPDX-FileCopyrightText: 2022-2024 Denis Danilov
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "JsonRW.h"
@@ -326,15 +326,22 @@ void TestTrack::testAudioFileOk()
   track.pause();
   QCOMPARE(track.isPlaying(), false);
   QVERIFY(track.playerA()->playbackState() == QMediaPlayer::PlaybackState::PausedState);
-  QVERIFY(track.playerB()->playbackState() == QMediaPlayer::PlaybackState::PausedState);
+  QVERIFY(track.playerB()->playbackState() != QMediaPlayer::PlaybackState::PlayingState);
 
   track.play();
   QCOMPARE(track.isPlaying(), true);
   QVERIFY(track.playerA()->playbackState() == QMediaPlayer::PlaybackState::PlayingState);
-  QVERIFY(track.playerB()->playbackState() == QMediaPlayer::PlaybackState::PausedState);
+  QVERIFY(track.playerB()->playbackState() != QMediaPlayer::PlaybackState::PlayingState);
 
+  QSignalSpy playbackStateA(track.playerA(), &QMediaPlayer::playbackStateChanged);
+  QSignalSpy playbackStateB(track.playerB(), &QMediaPlayer::playbackStateChanged);
   track.playerA()->mediaPlayerPositionChanged(track.duration());
   track.playerA()->mediaPlayerStatusChanged(QMediaPlayer::MediaStatus::EndOfMedia);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+  QVERIFY(playbackStateA.wait());
+  QVERIFY(playbackStateB.wait());
+#endif
+
   QVERIFY(track.playerA()->playbackState() == QMediaPlayer::PlaybackState::PausedState);
   QVERIFY(track.playerB()->playbackState() == QMediaPlayer::PlaybackState::PlayingState);
 
@@ -364,7 +371,7 @@ void TestTrack::testAudioFileDurationZero()
 
 void TestTrack::testAudioFileBroken()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
   QSKIP("Test does not work");
 #endif
 

diff --git a/tests/TestTrackControls.cpp b/tests/TestTrackControls.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022-2023 Denis Danilov
+// SPDX-FileCopyrightText: 2022-2024 Denis Danilov
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "JsonRW.h"
@@ -104,7 +104,7 @@ void TestTrackControls::testAudioFileOk()
 
 void TestTrackControls::testAudioFileBroken()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
   QSKIP("Test does not work");
 #endif
 
@@ -187,8 +187,14 @@ void TestTrackControls::testPauseAndResume()
   // player A is active, player B is not
   test_playing_state(track->playerA(), track->playerB());
 
+  QSignalSpy playbackStateA(track->playerA(), &QMediaPlayer::playbackStateChanged);
+  QSignalSpy playbackStateB(track->playerB(), &QMediaPlayer::playbackStateChanged);
   track->playerA()->mediaPlayerPositionChanged(track->duration());
   track->playerA()->mediaPlayerStatusChanged(QMediaPlayer::MediaStatus::EndOfMedia);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+  QVERIFY(playbackStateA.wait());
+  QVERIFY(playbackStateB.wait());
+#endif
   // player B is active, player A is not
   test_playing_state(track->playerB(), track->playerA());
 }