diff options
Diffstat (limited to 'tests/auto/installer')
-rw-r--r-- | tests/auto/installer/archivefactory/tst_archivefactory.cpp | 8 | ||||
-rw-r--r-- | tests/auto/installer/clientserver/tst_clientserver.cpp | 1 | ||||
-rw-r--r-- | tests/auto/installer/cliinterface/data/filequeryrepository/A/1.0.2-1meta.7z | bin | 907 -> 945 bytes | |||
-rw-r--r-- | tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp | 1 | ||||
-rw-r--r-- | tests/auto/installer/libarchivearchive/data.qrc | 1 | ||||
-rw-r--r-- | tests/auto/installer/libarchivearchive/data/valid.7z | bin | 0 -> 950 bytes | |||
-rw-r--r-- | tests/auto/installer/libarchivearchive/tst_libarchivearchive.cpp | 2 | ||||
-rw-r--r-- | tests/auto/installer/messageboxhandler/data/invalidoperation/A/1.0.2-1meta.7z | bin | 841 -> 875 bytes |
8 files changed, 9 insertions, 4 deletions
diff --git a/tests/auto/installer/archivefactory/tst_archivefactory.cpp b/tests/auto/installer/archivefactory/tst_archivefactory.cpp index 20fd4ab70..6320835a7 100644 --- a/tests/auto/installer/archivefactory/tst_archivefactory.cpp +++ b/tests/auto/installer/archivefactory/tst_archivefactory.cpp @@ -87,11 +87,13 @@ private slots: QTest::addColumn<QString>("handler"); QTest::addColumn<QString>("filename"); QTest::addColumn<QStringList>("types"); - QTest::newRow("Lib7z") - << "Lib7z" << "myfile.7z" << (QStringList() << "7z"); #ifdef IFW_LIBARCHIVE QTest::newRow("LibArchive") - << "LibArchive" << "myfile.zip" << (QStringList() << "tar.gz" << "tar.bz2" << "tar.xz" << "zip"); + << "LibArchive" << "myfile.zip" + << (QStringList() << "tar.gz" << "tar.bz2" << "tar.xz" << "zip" << "7z"); +#else + QTest::newRow("Lib7z") + << "Lib7z" << "myfile.7z" << (QStringList() << "7z"); #endif } diff --git a/tests/auto/installer/clientserver/tst_clientserver.cpp b/tests/auto/installer/clientserver/tst_clientserver.cpp index c0a2b1c3f..ebbe3af56 100644 --- a/tests/auto/installer/clientserver/tst_clientserver.cpp +++ b/tests/auto/installer/clientserver/tst_clientserver.cpp @@ -527,6 +527,7 @@ private slots: QTest::newRow("gzip compressed tar archive") << ".tar.gz"; QTest::newRow("bzip2 compressed tar archive") << ".tar.bz2"; QTest::newRow("xz compressed tar archive") << ".tar.xz"; + QTest::newRow("7zip archive") << ".7z"; } void testArchiveWrapper() diff --git a/tests/auto/installer/cliinterface/data/filequeryrepository/A/1.0.2-1meta.7z b/tests/auto/installer/cliinterface/data/filequeryrepository/A/1.0.2-1meta.7z Binary files differindex a006c5c96..0b0b6ade6 100644 --- a/tests/auto/installer/cliinterface/data/filequeryrepository/A/1.0.2-1meta.7z +++ b/tests/auto/installer/cliinterface/data/filequeryrepository/A/1.0.2-1meta.7z diff --git a/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp b/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp index 14afc6902..782f3b57e 100644 --- a/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp +++ b/tests/auto/installer/extractarchiveoperationtest/tst_extractarchiveoperationtest.cpp @@ -84,7 +84,6 @@ private slots: QVERIFY(op.undoOperation()); QCOMPARE(UpdateOperation::Error(op.error()), UpdateOperation::UserDefinedError); - QCOMPARE(op.errorString(), QString("Cannot open archive \":///data/invalid.7z\" for reading: ")); } void testExtractArchiveFromXML() diff --git a/tests/auto/installer/libarchivearchive/data.qrc b/tests/auto/installer/libarchivearchive/data.qrc index 83f15d241..dd9eb9090 100644 --- a/tests/auto/installer/libarchivearchive/data.qrc +++ b/tests/auto/installer/libarchivearchive/data.qrc @@ -4,5 +4,6 @@ <file>data/valid.tar.gz</file> <file>data/valid.tar.bz2</file> <file>data/valid.tar.xz</file> + <file>data/valid.7z</file> </qresource> </RCC> diff --git a/tests/auto/installer/libarchivearchive/data/valid.7z b/tests/auto/installer/libarchivearchive/data/valid.7z Binary files differnew file mode 100644 index 000000000..e583bdf99 --- /dev/null +++ b/tests/auto/installer/libarchivearchive/data/valid.7z diff --git a/tests/auto/installer/libarchivearchive/tst_libarchivearchive.cpp b/tests/auto/installer/libarchivearchive/tst_libarchivearchive.cpp index 280bb60d0..6b6eccbe4 100644 --- a/tests/auto/installer/libarchivearchive/tst_libarchivearchive.cpp +++ b/tests/auto/installer/libarchivearchive/tst_libarchivearchive.cpp @@ -245,6 +245,7 @@ private: QTest::newRow("gzip compressed tar archive") << ":///data/valid.tar.gz"; QTest::newRow("bzip2 compressed tar archive") << ":///data/valid.tar.bz2"; QTest::newRow("xz compressed tar archive") << ":///data/valid.tar.xz"; + QTest::newRow("7zip archive") << ":///data/valid.7z"; } void archiveSuffixesTestData() @@ -254,6 +255,7 @@ private: QTest::newRow("gzip compressed tar archive") << ".tar.gz"; QTest::newRow("bzip2 compressed tar archive") << ".tar.bz2"; QTest::newRow("xz compressed tar archive") << ".tar.xz"; + QTest::newRow("7z archive") << ".7z"; } QString tempSourceFile(const QByteArray &data, const QString &templateName = QString()) diff --git a/tests/auto/installer/messageboxhandler/data/invalidoperation/A/1.0.2-1meta.7z b/tests/auto/installer/messageboxhandler/data/invalidoperation/A/1.0.2-1meta.7z Binary files differindex 3653317c6..f51ed49fa 100644 --- a/tests/auto/installer/messageboxhandler/data/invalidoperation/A/1.0.2-1meta.7z +++ b/tests/auto/installer/messageboxhandler/data/invalidoperation/A/1.0.2-1meta.7z |