diff options
Diffstat (limited to 'tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp | 52 |
1 files changed, 15 insertions, 37 deletions
diff --git a/tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp b/tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp index 6ed0a6caa9..3d958a78fe 100644 --- a/tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp +++ b/tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp @@ -1,33 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com> -** 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$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> +// Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QTest> #include <QtCore/qobject.h> #include <QtCore/qmetaobject.h> @@ -98,6 +73,9 @@ void tst_QMetaEnum::valuesToKeys() QMetaEnum me = QMetaEnum::fromType<Qt::WindowFlags>(); QCOMPARE(me.valueToKeys(windowFlags), expected); + bool ok = false; + QCOMPARE(uint(me.keysToValue(expected, &ok)), windowFlags.toInt()); + QVERIFY(ok); } void tst_QMetaEnum::defaultConstructed() @@ -109,13 +87,13 @@ void tst_QMetaEnum::defaultConstructed() QCOMPARE(e.name(), QByteArray()); } -Q_STATIC_ASSERT(QtPrivate::IsQEnumHelper<tst_QMetaEnum::SuperEnum>::Value); -Q_STATIC_ASSERT(QtPrivate::IsQEnumHelper<Qt::WindowFlags>::Value); -Q_STATIC_ASSERT(QtPrivate::IsQEnumHelper<Qt::Orientation>::Value); -Q_STATIC_ASSERT(!QtPrivate::IsQEnumHelper<int>::Value); -Q_STATIC_ASSERT(!QtPrivate::IsQEnumHelper<QObject>::Value); -Q_STATIC_ASSERT(!QtPrivate::IsQEnumHelper<QObject*>::Value); -Q_STATIC_ASSERT(!QtPrivate::IsQEnumHelper<void>::Value); +static_assert(QtPrivate::IsQEnumHelper<tst_QMetaEnum::SuperEnum>::Value); +static_assert(QtPrivate::IsQEnumHelper<Qt::WindowFlags>::Value); +static_assert(QtPrivate::IsQEnumHelper<Qt::Orientation>::Value); +static_assert(!QtPrivate::IsQEnumHelper<int>::Value); +static_assert(!QtPrivate::IsQEnumHelper<QObject>::Value); +static_assert(!QtPrivate::IsQEnumHelper<QObject*>::Value); +static_assert(!QtPrivate::IsQEnumHelper<void>::Value); QTEST_MAIN(tst_QMetaEnum) #include "tst_qmetaenum.moc" |