aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/tests/QtQml/javascript_exceptions.py
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside6/tests/QtQml/javascript_exceptions.py')
-rw-r--r--sources/pyside6/tests/QtQml/javascript_exceptions.py40
1 files changed, 10 insertions, 30 deletions
diff --git a/sources/pyside6/tests/QtQml/javascript_exceptions.py b/sources/pyside6/tests/QtQml/javascript_exceptions.py
index fbf84fcf6..e2b530aaf 100644
--- a/sources/pyside6/tests/QtQml/javascript_exceptions.py
+++ b/sources/pyside6/tests/QtQml/javascript_exceptions.py
@@ -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 Qt for Python.
-##
-## $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) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
import os
import sys
@@ -35,7 +10,7 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
from init_paths import init_test_paths
init_test_paths(False)
-from helper.helper import adjust_filename
+from helper.helper import quickview_errorstring
from helper.usesqapplication import UsesQApplication
from PySide6.QtCore import Slot, Property, Signal, QObject, QUrl
@@ -59,6 +34,7 @@ property_test_string = """
test_1 = False
test_2 = False
+
class TestClass(QObject):
@Slot()
def methodThrows(self):
@@ -77,6 +53,7 @@ class TestClass(QObject):
else:
test_2 = True
+
class JavaScriptExceptionsTest(UsesQApplication):
def test_jsengine(self):
engine = QJSEngine()
@@ -96,12 +73,15 @@ class JavaScriptExceptionsTest(UsesQApplication):
self.assertEqual(result_2.property('name').toString(), 'TypeError')
def test_qml_type(self):
- qmlRegisterType(TestClass, 'JavaScriptExceptions', 1, 0, 'JavaScriptExceptions');
+ qmlRegisterType(TestClass, 'JavaScriptExceptions', 1, 0, 'JavaScriptExceptions')
view = QQuickView()
- qml_url = QUrl.fromLocalFile(adjust_filename('javascript_exceptions.qml', __file__))
+ file = Path(__file__).resolve().parent / 'javascript_exceptions.qml'
+ self.assertTrue(file.is_file())
+ qml_url = QUrl.fromLocalFile(file)
view.setSource(qml_url)
+ self.assertTrue(view.rootObject(), quickview_errorstring(view))
self.assertTrue(test_1)
self.assertTrue(test_2)