QSaveFile: unittests: use strlen() instead of hardcoded numbers

DRY with respect to string literals.

Change-Id: I606a4cbd502efb0f0f7d12176f4253fb2cd5eaa4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>

1 files changed, 14 insertions, 9 deletions

diff --git a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
index fbb6a29f26..d1f6916233 100644
--- a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
+++ b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
@@ -89,7 +89,8 @@ void tst_QSaveFile::transactionalWrite()
     QCOMPARE(file.fileName(), targetFile);
     QVERIFY(!QFile::exists(targetFile));
 
-    QCOMPARE(file.write("Hello"), Q_INT64_C(5));
+    const char *data = "Hello";
+    QCOMPARE(file.write(data), qint64(strlen(data)));
     QCOMPARE(file.error(), QFile::NoError);
     QVERIFY(!QFile::exists(targetFile));
 
@@ -99,7 +100,7 @@ void tst_QSaveFile::transactionalWrite()
 
     QFile reader(targetFile);
     QVERIFY(reader.open(QIODevice::ReadOnly));
-    QCOMPARE(QString::fromLatin1(reader.readAll()), QString::fromLatin1("Hello"));
+    QCOMPARE(QString::fromLatin1(reader.readAll()), QString::fromLatin1(data));
 
     // check that permissions are the same as for QFile
     const QString otherFile = dir.path() + QString::fromLatin1("/otherfile");
@@ -124,12 +125,13 @@ void tst_QSaveFile::retryTransactionalWrite()
     QTemporaryDir dir;
     QVERIFY2(dir.isValid(), qPrintable(dir.errorString()));
 
+    const char *data = "Hello";
     QString targetFile = dir.path() + QLatin1String("/outfile");
     const QString readOnlyName = targetFile + QLatin1String(".ro");
     {
         QFile readOnlyFile(readOnlyName);
         QVERIFY2(readOnlyFile.open(QIODevice::WriteOnly), msgCannotOpen(readOnlyFile).constData());
-        readOnlyFile.write("Hello");
+        readOnlyFile.write(data);
         readOnlyFile.close();
         auto permissions = readOnlyFile.permissions();
         permissions &= ~(QFileDevice::WriteOwner | QFileDevice::WriteGroup | QFileDevice::WriteUser);
@@ -142,13 +144,14 @@ void tst_QSaveFile::retryTransactionalWrite()
     file.setFileName(targetFile);
     QVERIFY2(file.open(QIODevice::WriteOnly), msgCannotOpen(file).constData());
     QVERIFY(file.isOpen());
-    QCOMPARE(file.write("Hello"), Q_INT64_C(5));
+    QCOMPARE(file.write(data), qint64(strlen(data)));
     QCOMPARE(file.error(), QFile::NoError);
     QVERIFY(file.commit());
 }
 
 void tst_QSaveFile::saveTwice()
 {
+    const char *hello = "Hello";
     // Check that we can reuse a QSaveFile object
     // (and test the case of an existing target file)
     QTemporaryDir dir;
@@ -156,16 +159,17 @@ void tst_QSaveFile::saveTwice()
     const QString targetFile = dir.path() + QString::fromLatin1("/outfile");
     QSaveFile file(targetFile);
     QVERIFY2(file.open(QIODevice::WriteOnly), msgCannotOpen(file).constData());
-    QCOMPARE(file.write("Hello"), Q_INT64_C(5));
+    QCOMPARE(file.write(hello), qint64(strlen(hello)));
     QVERIFY2(file.commit(), qPrintable(file.errorString()));
 
+    const char *world = "World";
     QVERIFY2(file.open(QIODevice::WriteOnly), msgCannotOpen(file).constData());
-    QCOMPARE(file.write("World"), Q_INT64_C(5));
+    QCOMPARE(file.write(world), qint64(strlen(world)));
     QVERIFY2(file.commit(), qPrintable(file.errorString()));
 
     QFile reader(targetFile);
     QVERIFY2(reader.open(QIODevice::ReadOnly), msgCannotOpen(reader).constData());
-    QCOMPARE(QString::fromLatin1(reader.readAll()), QString::fromLatin1("World"));
+    QCOMPARE(QString::fromLatin1(reader.readAll()), QString::fromLatin1(world));
 }
 
 void tst_QSaveFile::textStreamManualFlush()
@@ -176,8 +180,9 @@ void tst_QSaveFile::textStreamManualFlush()
     QSaveFile file(targetFile);
     QVERIFY2(file.open(QIODevice::WriteOnly), msgCannotOpen(file).constData());
 
+    const char *data = "Manual flush";
     QTextStream ts(&file);
-    ts << "Manual flush";
+    ts << data;
     ts.flush();
     QCOMPARE(file.error(), QFile::NoError);
     QVERIFY(!QFile::exists(targetFile));
@@ -185,7 +190,7 @@ void tst_QSaveFile::textStreamManualFlush()
     QVERIFY(file.commit());
     QFile reader(targetFile);
     QVERIFY(reader.open(QIODevice::ReadOnly));
-    QCOMPARE(QString::fromLatin1(reader.readAll().constData()), QString::fromLatin1("Manual flush"));
+    QCOMPARE(QString::fromLatin1(reader.readAll().constData()), QString::fromLatin1(data));
     QFile::remove(targetFile);
 }