slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix autotests expecting a trailing whitespace for qDebug stream

Browse Source 
The behavior of QDebug was fixed in qtbase. Update autotests
accordingly.

Change-Id: I0bbd1b52958c24710f877224158fa30f082941b8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Kai Koehne
2013-10-30 16:35:33 +01:00
committed by The Qt Project
parent 3da68ff8f2
commit 41d41ceb4a
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/auto/unit/qaudioformat/tst_qaudioformat.cpp
View File

@@ -323,7 +323,7 @@ void tst_QAudioFormat::debugOperator_data()
// A small sampling // A small sampling
QAudioFormat f; QAudioFormat f;
QTest::newRow("plain") << f << QString::fromLatin1("QAudioFormat(-1Hz, -1bit, channelCount=-1, sampleType=Unknown, byteOrder=LittleEndian, codec=\"\") "); QTest::newRow("plain") << f << QString::fromLatin1("QAudioFormat(-1Hz, -1bit, channelCount=-1, sampleType=Unknown, byteOrder=LittleEndian, codec=\"\")");
f.setSampleRate(22050); f.setSampleRate(22050);
f.setByteOrder(QAudioFormat::LittleEndian); f.setByteOrder(QAudioFormat::LittleEndian);
@@ -331,16 +331,16 @@ void tst_QAudioFormat::debugOperator_data()
f.setCodec("audio/pcm"); f.setCodec("audio/pcm");
f.setSampleType(QAudioFormat::Float); f.setSampleType(QAudioFormat::Float);
QTest::newRow("float") << f << QString::fromLatin1("QAudioFormat(22050Hz, -1bit, channelCount=4, sampleType=Float, byteOrder=LittleEndian, codec=\"audio/pcm\") "); QTest::newRow("float") << f << QString::fromLatin1("QAudioFormat(22050Hz, -1bit, channelCount=4, sampleType=Float, byteOrder=LittleEndian, codec=\"audio/pcm\")");
f.setSampleType(QAudioFormat::UnSignedInt); f.setSampleType(QAudioFormat::UnSignedInt);
QTest::newRow("unsigned") << f << QString::fromLatin1("QAudioFormat(22050Hz, -1bit, channelCount=4, sampleType=UnSignedInt, byteOrder=LittleEndian, codec=\"audio/pcm\") "); QTest::newRow("unsigned") << f << QString::fromLatin1("QAudioFormat(22050Hz, -1bit, channelCount=4, sampleType=UnSignedInt, byteOrder=LittleEndian, codec=\"audio/pcm\")");
f.setSampleRate(44100); f.setSampleRate(44100);
QTest::newRow("44.1 unsigned") << f << QString::fromLatin1("QAudioFormat(44100Hz, -1bit, channelCount=4, sampleType=UnSignedInt, byteOrder=LittleEndian, codec=\"audio/pcm\") "); QTest::newRow("44.1 unsigned") << f << QString::fromLatin1("QAudioFormat(44100Hz, -1bit, channelCount=4, sampleType=UnSignedInt, byteOrder=LittleEndian, codec=\"audio/pcm\")");
f.setByteOrder(QAudioFormat::BigEndian); f.setByteOrder(QAudioFormat::BigEndian);
QTest::newRow("44.1 big unsigned") << f << QString::fromLatin1("QAudioFormat(44100Hz, -1bit, channelCount=4, sampleType=UnSignedInt, byteOrder=BigEndian, codec=\"audio/pcm\") "); QTest::newRow("44.1 big unsigned") << f << QString::fromLatin1("QAudioFormat(44100Hz, -1bit, channelCount=4, sampleType=UnSignedInt, byteOrder=BigEndian, codec=\"audio/pcm\")");
} }
void tst_QAudioFormat::debugOperator() void tst_QAudioFormat::debugOperator()

16
tests/auto/unit/qcamera/tst_qcamera.cpp
View File

@@ -1125,21 +1125,21 @@ void tst_QCamera::testSetVideoOutputDestruction()
void tst_QCamera::testEnumDebug() void tst_QCamera::testEnumDebug()
{ {
QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveState "); QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveState");
qDebug() << QCamera::ActiveState; qDebug() << QCamera::ActiveState;
QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveStatus "); QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveStatus");
qDebug() << QCamera::ActiveStatus; qDebug() << QCamera::ActiveStatus;
QTest::ignoreMessage(QtDebugMsg, "QCamera::CaptureVideo "); QTest::ignoreMessage(QtDebugMsg, "QCamera::CaptureVideo");
qDebug() << QCamera::CaptureVideo; qDebug() << QCamera::CaptureVideo;
QTest::ignoreMessage(QtDebugMsg, "QCamera::CameraError "); QTest::ignoreMessage(QtDebugMsg, "QCamera::CameraError");
qDebug() << QCamera::CameraError; qDebug() << QCamera::CameraError;
QTest::ignoreMessage(QtDebugMsg, "QCamera::Unlocked "); QTest::ignoreMessage(QtDebugMsg, "QCamera::Unlocked");
qDebug() << QCamera::Unlocked; qDebug() << QCamera::Unlocked;
QTest::ignoreMessage(QtDebugMsg, "QCamera::LockAcquired "); QTest::ignoreMessage(QtDebugMsg, "QCamera::LockAcquired");
qDebug() << QCamera::LockAcquired; qDebug() << QCamera::LockAcquired;
QTest::ignoreMessage(QtDebugMsg, "QCamera::NoLock "); QTest::ignoreMessage(QtDebugMsg, "QCamera::NoLock");
qDebug() << QCamera::NoLock; qDebug() << QCamera::NoLock;
QTest::ignoreMessage(QtDebugMsg, "QCamera::LockExposure "); QTest::ignoreMessage(QtDebugMsg, "QCamera::LockExposure");
qDebug() << QCamera::LockExposure; qDebug() << QCamera::LockExposure;
} }

6
tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
View File

@@ -1106,11 +1106,11 @@ void tst_QMediaPlayer::testPositionPropertyWatch()
void tst_QMediaPlayer::debugEnums() void tst_QMediaPlayer::debugEnums()
{ {
QTest::ignoreMessage(QtDebugMsg, "QMediaPlayer::PlayingState "); QTest::ignoreMessage(QtDebugMsg, "QMediaPlayer::PlayingState");
qDebug() << QMediaPlayer::PlayingState; qDebug() << QMediaPlayer::PlayingState;
QTest::ignoreMessage(QtDebugMsg, "QMediaPlayer::NoMedia "); QTest::ignoreMessage(QtDebugMsg, "QMediaPlayer::NoMedia");
qDebug() << QMediaPlayer::NoMedia; qDebug() << QMediaPlayer::NoMedia;
QTest::ignoreMessage(QtDebugMsg, "QMediaPlayer::NetworkError "); QTest::ignoreMessage(QtDebugMsg, "QMediaPlayer::NetworkError");
qDebug() << QMediaPlayer::NetworkError; qDebug() << QMediaPlayer::NetworkError;
} }

2
tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
View File

@@ -999,7 +999,7 @@ void tst_QVideoSurfaceFormat::debugOperator()
" frameRate = QVariant(%7, %8) \n" " frameRate = QVariant(%7, %8) \n"
" pixelAspectRatio = QVariant(QSize, QSize(320, 200) ) \n" " pixelAspectRatio = QVariant(QSize, QSize(320, 200) ) \n"
" sizeHint = QVariant(QSize, QSize(1280, 600) ) \n" " sizeHint = QVariant(QSize, QSize(1280, 600) ) \n"
" yCbCrColorSpace = QVariant(QVideoSurfaceFormat::YCbCrColorSpace, ) ") " yCbCrColorSpace = QVariant(QVideoSurfaceFormat::YCbCrColorSpace, ) ")
.arg(formatString) .arg(formatString)
.arg(frameSize.width()) .arg(frameSize.width())
.arg(frameSize.height()) .arg(frameSize.height())