From 53d70144622f36c38b7559e6beb9cb79d4546096 Mon Sep 17 00:00:00 2001 From: kh1 Date: Fri, 3 May 2013 14:25:59 +0200 Subject: Add 7z facade auto test and fix bug in out stream. Change-Id: Idd046e09da0ee0fe49eb305296181f969b42e393 Reviewed-by: Niels Weber Reviewed-by: Tim Jenssen --- tests/auto/installer/installer.pro | 3 +- tests/auto/installer/lib7zfacade/data.qrc | 6 + tests/auto/installer/lib7zfacade/data/invalid.7z | Bin 0 -> 25600 bytes tests/auto/installer/lib7zfacade/data/valid.7z | Bin 0 -> 950 bytes tests/auto/installer/lib7zfacade/lib7zfacade.pro | 7 + .../auto/installer/lib7zfacade/tst_lib7zfacade.cpp | 181 +++++++++++++++++++++ 6 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 tests/auto/installer/lib7zfacade/data.qrc create mode 100644 tests/auto/installer/lib7zfacade/data/invalid.7z create mode 100644 tests/auto/installer/lib7zfacade/data/valid.7z create mode 100644 tests/auto/installer/lib7zfacade/lib7zfacade.pro create mode 100644 tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp (limited to 'tests/auto') diff --git a/tests/auto/installer/installer.pro b/tests/auto/installer/installer.pro index e22407368..5b4c32dab 100644 --- a/tests/auto/installer/installer.pro +++ b/tests/auto/installer/installer.pro @@ -6,4 +6,5 @@ SUBDIRS += \ componentmodel \ fakestopprocessforupdateoperation \ messageboxhandler \ - extractarchiveoperationtest + extractarchiveoperationtest \ + lib7zfacade diff --git a/tests/auto/installer/lib7zfacade/data.qrc b/tests/auto/installer/lib7zfacade/data.qrc new file mode 100644 index 000000000..d6453a9b3 --- /dev/null +++ b/tests/auto/installer/lib7zfacade/data.qrc @@ -0,0 +1,6 @@ + + + data/valid.7z + data/invalid.7z + + diff --git a/tests/auto/installer/lib7zfacade/data/invalid.7z b/tests/auto/installer/lib7zfacade/data/invalid.7z new file mode 100644 index 000000000..bcf81250e Binary files /dev/null and b/tests/auto/installer/lib7zfacade/data/invalid.7z differ diff --git a/tests/auto/installer/lib7zfacade/data/valid.7z b/tests/auto/installer/lib7zfacade/data/valid.7z new file mode 100644 index 000000000..e583bdf99 Binary files /dev/null and b/tests/auto/installer/lib7zfacade/data/valid.7z differ diff --git a/tests/auto/installer/lib7zfacade/lib7zfacade.pro b/tests/auto/installer/lib7zfacade/lib7zfacade.pro new file mode 100644 index 000000000..034cf1eed --- /dev/null +++ b/tests/auto/installer/lib7zfacade/lib7zfacade.pro @@ -0,0 +1,7 @@ +include(../../qttest.pri) + +QT -= gui +QT += testlib + +RESOURCES += data.qrc +SOURCES = tst_lib7zfacade.cpp diff --git a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp new file mode 100644 index 000000000..d6945bf68 --- /dev/null +++ b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp @@ -0,0 +1,181 @@ +/************************************************************************** +** +** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ + +#include "init.h" +#include "lib7z_facade.h" + +#include +#include +#include +#include + +class tst_lib7zfacade : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase() + { + QInstaller::init(); + + m_file.path = "valid"; + m_file.permissions = 0; + m_file.compressedSize = 836; + m_file.uncompressedSize = 5242880; + m_file.isDirectory = false; + m_file.archiveIndex = QPoint(0, 0); + m_file.mtime = QDateTime(QDate::fromJulianDay(2456413), QTime(12, 50, 42)); + } + + void testIsSupportedArchive() + { + QCOMPARE(Lib7z::isSupportedArchive(":///data/valid.7z"), true); + QCOMPARE(Lib7z::isSupportedArchive(":///data/invalid.7z"), false); + + { + QFile file(":///data/valid.7z"); + QVERIFY(file.open(QIODevice::ReadOnly)); + QCOMPARE(Lib7z::isSupportedArchive(&file), true); + } + + { + QFile file(":///data/invalid.7z"); + QVERIFY(file.open(QIODevice::ReadOnly)); + QCOMPARE(Lib7z::isSupportedArchive(&file), false); + } + } + + void testListArchive() + { + // TODO: this should work without scope, there's a bug in Lib7z::OpenArchiveInfo + // caused by the fact that we keep a pointer to the device, not the devices target + { + QFile file(":///data/valid.7z"); + QVERIFY(file.open(QIODevice::ReadOnly)); + + QVector files = Lib7z::listArchive(&file); + QCOMPARE(files.count(), 1); + QCOMPARE(files.first(), m_file); + } + + { + try { + QFile file(":///data/invalid.7z"); + QVERIFY(file.open(QIODevice::ReadOnly)); + QVector files = Lib7z::listArchive(&file); + } catch (const Lib7z::SevenZipException& e) { + QCOMPARE(e.message(), QString("Could not open archive")); + } catch (...) { + QFAIL("Unexpected error during list archive!"); + } + } + } + + void testCreateArchive() + { + QTemporaryFile target; + QVERIFY(target.open()); + + try { + // TODO: we do not get any information about success + Lib7z::createArchive(&target, QStringList() << ":///data/invalid.7z"); + } catch (const Lib7z::SevenZipException& e) { + QFAIL(e.message().toUtf8()); + } catch (...) { + QFAIL("Unexpected error during create archive!"); + } + } + + void testExtractArchive() + { + QFile source(":///data/valid.7z"); + QVERIFY(source.open(QIODevice::ReadOnly)); + + try { + // TODO: we do not get any information about success + Lib7z::extractArchive(&source, QDir::tempPath()); + } catch (const Lib7z::SevenZipException& e) { + QFAIL(e.message().toUtf8()); + } catch (...) { + QFAIL("Unexpected error during extract archive!"); + } + } + + void testExtractFileFromArchive() + { + QFile source(":///data/valid.7z"); + QVERIFY(source.open(QIODevice::ReadOnly)); + + QTemporaryFile target; + QVERIFY(target.open()); + + try { + // TODO: we do not get any information about success + Lib7z::extractFileFromArchive(&source, m_file, &target); + } catch (const Lib7z::SevenZipException& e) { + QFAIL(e.message().toUtf8()); + } catch (...) { + QFAIL("Unexpected error during extract file from archive!"); + } + } + + void testExtractFileFromArchive2() + { + QFile source(":///data/valid.7z"); + QVERIFY(source.open(QIODevice::ReadOnly)); + + try { + // TODO: we do not get any information about success + Lib7z::extractFileFromArchive(&source, m_file, QDir::tempPath()); + } catch (const Lib7z::SevenZipException& e) { + QFAIL(e.message().toUtf8()); + } catch (...) { + QFAIL("Unexpected error during extract file from archive!"); + } + } + +private: + Lib7z::File m_file; +}; + +QTEST_MAIN(tst_lib7zfacade) + +#include "tst_lib7zfacade.moc" -- cgit v1.2.3