diff options
Diffstat (limited to 'tests/auto/render/qshaderimage/tst_qshaderimage.cpp')
| -rw-r--r-- | tests/auto/render/qshaderimage/tst_qshaderimage.cpp | 68 |
1 files changed, 16 insertions, 52 deletions
diff --git a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp index cc5081063..2b5295ac4 100644 --- a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp +++ b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $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 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qshaderimage.h> @@ -85,7 +49,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.texture(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -93,7 +57,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.texture(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -104,7 +68,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.layered(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -112,7 +76,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.layered(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -123,7 +87,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -131,7 +95,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -142,7 +106,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.layer(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -150,7 +114,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.layer(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -161,7 +125,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.access(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -169,7 +133,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.access(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -180,7 +144,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.format(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -188,7 +152,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.format(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -387,13 +351,13 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.texture(), &tex); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); } // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QVERIFY(shaderImage.texture() == nullptr); } |