diff -r b72c6db6890b -r 5dc02b23752f tests/auto/qzip/tst_qzip.cpp --- a/tests/auto/qzip/tst_qzip.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/tests/auto/qzip/tst_qzip.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -77,6 +77,7 @@ QCOMPARE(files.count(), 2); QZipReader::FileInfo fi = files.at(0); + QVERIFY(fi.isValid()); QCOMPARE(fi.filePath, QString("test/")); QCOMPARE(uint(fi.isDir), (uint) 1); QCOMPARE(uint(fi.isFile), (uint) 0); @@ -85,7 +86,10 @@ QCOMPARE(fi.permissions,QFile::Permissions( QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner | QFile::ReadUser | QFile::WriteUser | QFile::ExeUser )); + QCOMPARE(fi.lastModified, QDateTime::fromString("2005.11.11 13:08:02", "yyyy.MM.dd HH:mm:ss")); + fi = files.at(1); + QVERIFY(fi.isValid()); QCOMPARE(fi.filePath, QString("test/test.txt")); QCOMPARE(uint(fi.isDir), (uint) 0); QCOMPARE(uint(fi.isFile), (uint) 1); @@ -94,7 +98,12 @@ QVERIFY(fi.permissions == QFile::Permissions( QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::WriteUser )); + QCOMPARE(fi.lastModified, QDateTime::fromString("2005.11.11 13:08:02", "yyyy.MM.dd HH:mm:ss")); + QCOMPARE(zip.fileData("test/test.txt"), QByteArray("content\n")); + + fi = files.at(-1); + QVERIFY(!fi.isValid()); } void tst_QZip::symlinks() @@ -104,6 +113,7 @@ QCOMPARE(files.count(), 2); QZipReader::FileInfo fi = files.at(0); + QVERIFY(fi.isValid()); QCOMPARE(fi.filePath, QString("symlink")); QVERIFY(!fi.isDir); QVERIFY(!fi.isFile); @@ -112,6 +122,7 @@ QCOMPARE(zip.fileData("symlink"), QByteArray("destination")); fi = files.at(1); + QVERIFY(fi.isValid()); QCOMPARE(fi.filePath, QString("destination")); QVERIFY(!fi.isDir); QVERIFY(fi.isFile);