diff options
Diffstat (limited to 'tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp')
| -rw-r--r-- | tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp index 47a879db2..542b1fe41 100644 --- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp +++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <QtCore/QFileInfo> @@ -158,7 +133,7 @@ void tst_QHelpGenerator::checkFiles() "AND b.FileId=a.FileID AND c.Name=\'filter1\'"); while (m_query->next()) lst.removeAll(m_query->value(0).toString()); - QCOMPARE(lst.count(), 0); + QCOMPARE(lst.size(), 0); QMap<int, QStringList> fileAtts; m_query->exec("SELECT a.Id, b.Name FROM FileAttributeSetTable a, " @@ -169,7 +144,7 @@ void tst_QHelpGenerator::checkFiles() fileAtts.insert(id, QStringList()); fileAtts[id].append(m_query->value(1).toString()); } - QCOMPARE(fileAtts.count(), 2); + QCOMPARE(fileAtts.size(), 2); QVERIFY(fileAtts.value(1).contains("test")); QVERIFY(fileAtts.value(1).contains("filter1")); QVERIFY(!fileAtts.value(1).contains("filter2")); |