Tests: improve logging of audio sink/source test valuesHEADdev

Pick-to: 6.8 6.9 6.10
Change-Id: Iad6c1ce562e12470e8a32a9ccfa4b2c0a4471da5
Reviewed-by: Artem Dyomin <[email protected]>

2 files changed, 11 insertions, 14 deletions

diff --git a/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp b/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
index ddd4fb5c9..42dd230a5 100644
--- a/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
+++ b/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
@@ -898,8 +898,8 @@ void tst_QAudioSink::pushSuspendResume()
     const qint64 elapsedUs = audioSink.elapsedUSecs();
     const qint64 processedUs = audioSink.processedUSecs();
     QTest::qWait(100);
-    QVERIFY(audioSink.elapsedUSecs() > elapsedUs);
-    QVERIFY(audioSink.processedUSecs() == processedUs);
+    QCOMPARE_GT(audioSink.elapsedUSecs(), elapsedUs);
+    QCOMPARE(audioSink.processedUSecs(), processedUs);
 
     audioSink.resume();
 
@@ -1035,9 +1035,8 @@ void tst_QAudioSink::pushUnderrun()
 
     // Check that 'elapsed' increases
     QTest::qWait(40);
-    QVERIFY2((audioSink.elapsedUSecs() > 0), "elapsedUSecs() is still zero after start()");
-    QVERIFY2((audioSink.processedUSecs() == qint64(0)),
-             "processedUSecs() is not zero after start()");
+    QCOMPARE_GT(audioSink.elapsedUSecs(), 0);
+    QCOMPARE(audioSink.processedUSecs(), qint64(0));
 
     qint64 written = 0;
 
@@ -1114,8 +1113,7 @@ void tst_QAudioSink::pushUnderrun()
              "didn't transitions to StoppedState after stop()");
 
     QVERIFY2((audioSink.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()");
-    QVERIFY2((audioSink.elapsedUSecs() == (qint64)0),
-             "elapsedUSecs() not equal to zero in StoppedState");
+    QCOMPARE(audioSink.elapsedUSecs(), 0);
 
     audioFile->close();
 }
diff --git a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
index fd9c2f95c..6dccf0d5b 100644
--- a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
+++ b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
@@ -434,9 +434,8 @@ void tst_QAudioSource::pull()
     stateSignal.clear();
 
     // Check that 'elapsed' increases
-    QTRY_VERIFY2((audioSource.elapsedUSecs() > 0), "elapsedUSecs() is still zero after start()");
-    QTRY_VERIFY2((audioSource.processedUSecs() > 0),
-                 "processedUSecs() is still zero after start()");
+    QTRY_COMPARE_GT(audioSource.elapsedUSecs(), 0);
+    QTRY_COMPARE_GT(audioSource.processedUSecs(), 0);
 
     // Allow some recording to happen
     QTest::qWait(3000); // 3 seconds should be plenty
@@ -548,8 +547,8 @@ void tst_QAudioSource::pullSuspendResume()
                      .arg(processedUs)
                      .toUtf8()
                      .constData());
-    QTRY_VERIFY(audioSource.elapsedUSecs() > elapsedUs);
-    QVERIFY(audioSource.processedUSecs() == processedUs);
+    QTRY_COMPARE_GT(audioSource.elapsedUSecs(), elapsedUs);
+    QCOMPARE(audioSource.processedUSecs(), processedUs);
 
     audioSource.resume();
 
@@ -762,8 +761,8 @@ void tst_QAudioSource::pushSuspendResume()
     // Check that only 'elapsed', and not 'processed' increases while suspended
     qint64 elapsedUs = audioSource.elapsedUSecs();
     qint64 processedUs = audioSource.processedUSecs();
-    QTRY_VERIFY(audioSource.elapsedUSecs() > elapsedUs);
-    QVERIFY(audioSource.processedUSecs() == processedUs);
+    QTRY_COMPARE_GT(audioSource.elapsedUSecs(), elapsedUs);
+    QCOMPARE(audioSource.processedUSecs(), processedUs);
 
     // Drain any data, in case we run out of space when resuming
     while (feed->readAll().size() > 0)