diff options
Diffstat (limited to 'tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp')
| -rw-r--r-- | tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp | 98 |
1 files changed, 65 insertions, 33 deletions
diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp b/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp index c9365360de..a7b45f30f9 100644 --- a/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.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 <QTest> @@ -57,6 +32,9 @@ class tst_VerifyExceptionThrown: public QObject Q_OBJECT private: void doSomething() const {} +#ifndef QT_NO_EXCEPTIONS + void throwSomething() const { throw std::logic_error("This line doesn't throw"); } +#endif private slots: // Remove all test cases if exceptions are not available @@ -64,6 +42,7 @@ private slots: void testCorrectStdTypes() const; void testCorrectStdExceptions() const; void testCorrectMyExceptions() const; + void testCorrectNoException() const; void testFailInt() const; void testFailStdString() const; @@ -72,6 +51,7 @@ private slots: void testFailMyDerivedException() const; void testFailNoException() const; + void testFailNoException2() const; #endif // !QT_NO_EXCEPTIONS }; @@ -81,63 +61,115 @@ private slots: void tst_VerifyExceptionThrown::testCorrectStdTypes() const { + QVERIFY_THROWS_EXCEPTION(int, throw int(5)); + QVERIFY_THROWS_EXCEPTION(float, throw float(9.8)); + QVERIFY_THROWS_EXCEPTION(bool, throw bool(true)); + QVERIFY_THROWS_EXCEPTION(std::string, throw std::string("some string")); +#if QT_DEPRECATED_SINCE(6, 3) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED QVERIFY_EXCEPTION_THROWN(throw int(5), int); QVERIFY_EXCEPTION_THROWN(throw float(9.8), float); QVERIFY_EXCEPTION_THROWN(throw bool(true), bool); QVERIFY_EXCEPTION_THROWN(throw std::string("some string"), std::string); + QT_WARNING_POP +#endif } void tst_VerifyExceptionThrown::testCorrectStdExceptions() const { // same type + QVERIFY_THROWS_EXCEPTION(std::exception, throw std::exception()); + QVERIFY_THROWS_EXCEPTION(std::runtime_error, throw std::runtime_error("runtime error")); + QVERIFY_THROWS_EXCEPTION(std::overflow_error, throw std::overflow_error("overflow error")); +#if QT_DEPRECATED_SINCE(6, 3) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED QVERIFY_EXCEPTION_THROWN(throw std::exception(), std::exception); QVERIFY_EXCEPTION_THROWN(throw std::runtime_error("runtime error"), std::runtime_error); QVERIFY_EXCEPTION_THROWN(throw std::overflow_error("overflow error"), std::overflow_error); + QT_WARNING_POP +#endif // inheritance + QVERIFY_THROWS_EXCEPTION(std::runtime_error, throw std::overflow_error("overflow error")); + QVERIFY_THROWS_EXCEPTION(std::exception, throw std::overflow_error("overflow error")); +#if QT_DEPRECATED_SINCE(6, 3) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED QVERIFY_EXCEPTION_THROWN(throw std::overflow_error("overflow error"), std::runtime_error); QVERIFY_EXCEPTION_THROWN(throw std::overflow_error("overflow error"), std::exception); + QT_WARNING_POP +#endif } void tst_VerifyExceptionThrown::testCorrectMyExceptions() const { // same type + QVERIFY_THROWS_EXCEPTION(MyBaseException, throw MyBaseException()); + QVERIFY_THROWS_EXCEPTION(MyDerivedException, throw MyDerivedException()); +#if QT_DEPRECATED_SINCE(6, 3) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED QVERIFY_EXCEPTION_THROWN(throw MyBaseException(), MyBaseException); QVERIFY_EXCEPTION_THROWN(throw MyDerivedException(), MyDerivedException); + QT_WARNING_POP +#endif // inheritance + QVERIFY_THROWS_EXCEPTION(MyBaseException, throw MyDerivedException()); + QVERIFY_THROWS_EXCEPTION(std::domain_error, throw MyDerivedException()); +#if QT_DEPRECATED_SINCE(6, 3) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED QVERIFY_EXCEPTION_THROWN(throw MyDerivedException(), MyBaseException); QVERIFY_EXCEPTION_THROWN(throw MyDerivedException(), std::domain_error); + QT_WARNING_POP +#endif +} + +void tst_VerifyExceptionThrown::testCorrectNoException() const +{ + QVERIFY_THROWS_NO_EXCEPTION(doSomething()); } void tst_VerifyExceptionThrown::testFailInt() const { - QVERIFY_EXCEPTION_THROWN(throw int(5), double); + try { + QVERIFY_THROWS_EXCEPTION(double, throw int(5)); + } catch (int) {} } void tst_VerifyExceptionThrown::testFailStdString() const { - QVERIFY_EXCEPTION_THROWN(throw std::string("some string"), char*); + try { + QVERIFY_THROWS_EXCEPTION(char*, throw std::string("some string")); + } catch (const std::string &) {} } void tst_VerifyExceptionThrown::testFailStdRuntimeError() const { - QVERIFY_EXCEPTION_THROWN(throw std::logic_error("logic error"), std::runtime_error); + QVERIFY_THROWS_EXCEPTION(std::runtime_error, throw std::logic_error("logic error")); } void tst_VerifyExceptionThrown::testFailMyException() const { - QVERIFY_EXCEPTION_THROWN(throw std::logic_error("logic error"), MyBaseException); + QVERIFY_THROWS_EXCEPTION(MyBaseException, throw std::logic_error("logic error")); } void tst_VerifyExceptionThrown::testFailMyDerivedException() const { - QVERIFY_EXCEPTION_THROWN(throw MyDerivedException(), std::runtime_error); + QVERIFY_THROWS_EXCEPTION(std::runtime_error, throw MyDerivedException()); } void tst_VerifyExceptionThrown::testFailNoException() const { - QVERIFY_EXCEPTION_THROWN(doSomething(), std::exception); + QVERIFY_THROWS_EXCEPTION(std::exception, doSomething()); +} + +void tst_VerifyExceptionThrown::testFailNoException2() const +{ + QVERIFY_THROWS_NO_EXCEPTION(throwSomething()); } #endif // !QT_NO_EXCEPTIONS |