From 5a3063968c21be4522f3cc5bfd9d1471cc4d57c2 Mon Sep 17 00:00:00 2001 From: kh1 Date: Fri, 11 Jul 2014 15:36:38 +0200 Subject: Make the marker and the find function class members. Prepare for QTIFW-292 and QTIFW-345. Change-Id: I065366742d28e72bc5ae55e70eabf6532b809fea Reviewed-by: Karsten Heimrich --- tests/auto/installer/binaryformat/tst_binaryformat.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tests/auto/installer/binaryformat/tst_binaryformat.cpp') diff --git a/tests/auto/installer/binaryformat/tst_binaryformat.cpp b/tests/auto/installer/binaryformat/tst_binaryformat.cpp index b84e83f77..a17226d46 100644 --- a/tests/auto/installer/binaryformat/tst_binaryformat.cpp +++ b/tests/auto/installer/binaryformat/tst_binaryformat.cpp @@ -62,9 +62,10 @@ private slots: try { QInstaller::blockingWrite(&file, QByteArray(scSmallSize, '1')); - QInstaller::appendInt64(&file, QInstaller::MagicCookie); + QInstaller::appendInt64(&file, QInstaller::BinaryContent::MagicCookie); - QCOMPARE(QInstaller::findMagicCookie(&file, QInstaller::MagicCookie), scSmallSize); + QCOMPARE(QInstaller::BinaryContent::findMagicCookie(&file, + QInstaller::BinaryContent::MagicCookie), scSmallSize); } catch (const QInstaller::Error &error) { QFAIL(qPrintable(error.message())); } catch (...) { @@ -79,10 +80,11 @@ private slots: try { QInstaller::blockingWrite(&file, QByteArray(scLargeSize, '1')); - QInstaller::appendInt64(&file, QInstaller::MagicCookie); + QInstaller::appendInt64(&file, QInstaller::BinaryContent::MagicCookie); QInstaller::blockingWrite(&file, QByteArray(scTinySize, '2')); - QCOMPARE(QInstaller::findMagicCookie(&file, QInstaller::MagicCookie), scLargeSize); + QCOMPARE(QInstaller::BinaryContent::findMagicCookie(&file, + QInstaller::BinaryContent::MagicCookie), scLargeSize); } catch (const QInstaller::Error &error) { QFAIL(qPrintable(error.message())); } catch (...) { @@ -101,7 +103,7 @@ private slots: QInstaller::blockingWrite(&file, QByteArray(scTinySize, '1')); // throws - QInstaller::findMagicCookie(&file, QInstaller::MagicCookie); + QInstaller::BinaryContent::findMagicCookie(&file, QInstaller::BinaryContent::MagicCookie); } catch (const QInstaller::Error &error) { QCOMPARE(qPrintable(error.message()), "No marker found, stopped after 71.00 KiB."); } catch (...) { -- cgit v1.2.3