1 files changed, 22 insertions, 44 deletions
diff --git a/sources/pyside6/tests/QtCore/qresource_test.py b/sources/pyside6/tests/QtCore/qresource_test.py
index 40d90c65c..1cdd2c785 100644
--- a/sources/pyside6/tests/QtCore/qresource_test.py
+++ b/sources/pyside6/tests/QtCore/qresource_test.py
@@ -1,32 +1,5 @@
-# -*- coding: utf-8 -*-
-
-#############################################################################
-##
-## 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
 
 '''Test cases for QResource usage'''
 
@@ -39,34 +12,39 @@ 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 PySide6.QtCore import QFile, QIODevice
+from PySide6.QtCore import QByteArray, QFile, QIODevice
 import resources_mc
 
+
 class ResourcesUsage(unittest.TestCase):
     '''Test case for resources usage'''
 
     def testPhrase(self):
-        #Test loading of quote.txt resource
-        f = open(adjust_filename('quoteEnUS.txt', __file__), "r")
-        orig = f.read()
-        f.close()
-
-        f = QFile(':/quote.txt')
-        f.open(QIODevice.ReadOnly) #|QIODevice.Text)
-        print("Error:", f.errorString())
+        # Test loading of quote.txt resource
+        file = Path(__file__).resolve().parent / 'quoteEnUS.txt'
+        self.assertTrue(file.is_file())
+        orig = QByteArray(file.read_bytes())
+        # In case the file is checked out in 'crlf' mode, strip '\r'
+        # since we read binary.
+        if sys.platform == 'win32':
+            carriage_return = orig.indexOf('\r')
+            if carriage_return != -1:
+                orig.remove(carriage_return, 1)
+
+        f = QFile(':/quote.txt')  # |QIODevice.Text
+        self.assertTrue(f.open(QIODevice.ReadOnly), f.errorString())
         copy = f.readAll()
         f.close()
         self.assertEqual(orig, copy)
 
     def testImage(self):
-        #Test loading of sample.png resource
-        f = open(adjust_filename('sample.png', __file__), "rb")
-        orig = f.read()
-        f.close()
+        # Test loading of sample.png resource
+        file = Path(__file__).resolve().parent / 'sample.png'
+        self.assertTrue(file.is_file())
+        orig = file.read_bytes()
 
         f = QFile(':/sample.png')
-        f.open(QIODevice.ReadOnly)
+        self.assertTrue(f.open(QIODevice.ReadOnly), f.errorString())
         copy = f.readAll()
         f.close()
         self.assertEqual(len(orig), len(copy))