1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor improvement to QByteArray autotest

Browse Source 
Rename the qUncompress test to make clear that the test only deals with
uncompressing corrupted data and add a message making it clear that this
test will produce some warning messages.

Don't skip creating the test data, as that prevents the test output
reporting exactly what is skipped.

The expected output is the same for every row (an empty QByteArray), so
don't bother storing that in the data table.

Change-Id: I59f1cc91a941bcaadacb2a613dd5eca2564961c1
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-11-29 17:14:54 +10:00 committed by Qt by Nokia
parent 7f64c3ddc8
commit d7fb773727
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
View File

@ -63,8 +63,8 @@ private slots:
void qCompress_data(); void qCompress_data();
#ifndef QT_NO_COMPRESS #ifndef QT_NO_COMPRESS
void qCompress(); void qCompress();
void qUncompress_data(); void qUncompressCorruptedData_data();
void qUncompress(); void qUncompressCorruptedData();
void qCompressionZeroTermination(); void qCompressionZeroTermination();
#endif #endif
void constByteArray(); void constByteArray();
@ -185,45 +185,40 @@ void tst_QByteArray::qCompress()
QTEST( ::qUncompress( compressed ), "ba" ); QTEST( ::qUncompress( compressed ), "ba" );
} }
// Corrupt data causes this test to lock up on HP-UX / PA-RISC with gcc, void tst_QByteArray::qUncompressCorruptedData_data()
// SOLARIS, QNX and Windows.
void tst_QByteArray::qUncompress_data()
{ {
#if !(defined(Q_OS_HPUX) && !defined(__ia64) && defined(Q_CC_GNU)) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_QNX) && !defined(Q_OS_WIN)
QTest::addColumn<QByteArray>("in"); QTest::addColumn<QByteArray>("in");
QTest::addColumn<QByteArray>("out");
QTest::newRow("0x00000000") << QByteArray("\x00\x00\x00\x00", 4) << QByteArray(); QTest::newRow("0x00000000") << QByteArray("\x00\x00\x00\x00", 4);
QTest::newRow("0x000000ff") << QByteArray("\x00\x00\x00\xff", 4) << QByteArray(); QTest::newRow("0x000000ff") << QByteArray("\x00\x00\x00\xff", 4);
QTest::newRow("0x3f000000") << QByteArray("\x3f\x00\x00\x00", 4) << QByteArray(); QTest::newRow("0x3f000000") << QByteArray("\x3f\x00\x00\x00", 4);
QTest::newRow("0x3fffffff") << QByteArray("\x3f\xff\xff\xff", 4) << QByteArray(); QTest::newRow("0x3fffffff") << QByteArray("\x3f\xff\xff\xff", 4);
QTest::newRow("0x7fffff00") << QByteArray("\x7f\xff\xff\x00", 4) << QByteArray(); QTest::newRow("0x7fffff00") << QByteArray("\x7f\xff\xff\x00", 4);
QTest::newRow("0x7fffffff") << QByteArray("\x7f\xff\xff\xff", 4) << QByteArray(); QTest::newRow("0x7fffffff") << QByteArray("\x7f\xff\xff\xff", 4);
QTest::newRow("0x80000000") << QByteArray("\x80\x00\x00\x00", 4) << QByteArray(); QTest::newRow("0x80000000") << QByteArray("\x80\x00\x00\x00", 4);
QTest::newRow("0x800000ff") << QByteArray("\x80\x00\x00\xff", 4) << QByteArray(); QTest::newRow("0x800000ff") << QByteArray("\x80\x00\x00\xff", 4);
QTest::newRow("0xcf000000") << QByteArray("\xcf\x00\x00\x00", 4) << QByteArray(); QTest::newRow("0xcf000000") << QByteArray("\xcf\x00\x00\x00", 4);
QTest::newRow("0xcfffffff") << QByteArray("\xcf\xff\xff\xff", 4) << QByteArray(); QTest::newRow("0xcfffffff") << QByteArray("\xcf\xff\xff\xff", 4);
QTest::newRow("0xffffff00") << QByteArray("\xff\xff\xff\x00", 4) << QByteArray(); QTest::newRow("0xffffff00") << QByteArray("\xff\xff\xff\x00", 4);
QTest::newRow("0xffffffff") << QByteArray("\xff\xff\xff\xff", 4) << QByteArray(); QTest::newRow("0xffffffff") << QByteArray("\xff\xff\xff\xff", 4);
#else
QSKIP("Test does not make sense on this platform");
#endif
} }
void tst_QByteArray::qUncompress() // Corrupt data causes this test to lock up on HP-UX / PA-RISC with gcc,
// SOLARIS, QNX and Windows.
// This test is expected to produce some warning messages in the test output.
void tst_QByteArray::qUncompressCorruptedData()
{ {
#if !(defined(Q_OS_HPUX) && !defined(__ia64) && defined(Q_CC_GNU)) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_QNX) && !defined(Q_OS_WIN) #if !(defined(Q_OS_HPUX) && !defined(__ia64) && defined(Q_CC_GNU)) && !defined(Q_OS_SOLARIS) && !defined(Q_OS_QNX) && !defined(Q_OS_WIN)
QFETCH(QByteArray, in); QFETCH(QByteArray, in);
QFETCH(QByteArray, out);
QByteArray res; QByteArray res;
res = ::qUncompress(in); res = ::qUncompress(in);
QCOMPARE(res, out); QCOMPARE(res, QByteArray());
res = ::qUncompress(in + "blah"); res = ::qUncompress(in + "blah");
QCOMPARE(res, out); QCOMPARE(res, QByteArray());
#else #else
QSKIP("Test does not make sense on this platform"); QSKIP("This test freezes on this platform");
#endif #endif
} }