summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-04-21 11:15:35 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-18 10:46:41 +1000
commit9e0049f656c7ec073ec042552ec7be1fb3946755 (patch)
treeb93a050e54923c44ee215131d75027397f8998d5 /tests/auto
parent2d471a2bef76237e6796e011d06a96b34c4ca96e (diff)
Fix logic error in large file autotest
The function generating data blocks was filling the block to 16 bytes short of the blockSize, then appending three 8 byte values, causing the block to grow 8 bytes beyond blockSize and then truncating it back to blockSize. This commit makes the code fill the block to 24 bytes short of the blockSize, so that the block will always end up at the correct size and truncation is not needed. Change-Id: I9fe6e6d6cf7bc445513b53e0a910d205c4c8002f Reviewed-by: Rohan McGovern (cherry picked from commit b1eb564830ff1b754de14919ce5c1547e9758f7c)
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qfile/largefile/tst_largefile.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/qfile/largefile/tst_largefile.cpp b/tests/auto/qfile/largefile/tst_largefile.cpp
index a9ad017e14..47f2e734b7 100644
--- a/tests/auto/qfile/largefile/tst_largefile.cpp
+++ b/tests/auto/qfile/largefile/tst_largefile.cpp
@@ -206,14 +206,13 @@ static inline QByteArray generateDataBlock(int blockSize, QString text, qint64 u
QByteArray filler("0123456789");
block.append(filler.right(10 - block.size() % 10));
- topUpWith(block, filler, blockSize - 2 * sizeof(qint64));
+ topUpWith(block, filler, blockSize - 3 * sizeof(qint64));
appendRaw(block, counter);
appendRaw(block, userBits);
appendRaw(block, randomBits);
- Q_ASSERT( block.size() >= blockSize );
- block.resize(blockSize);
+ Q_ASSERT( block.size() == blockSize );
++counter;
return block;