7 files changed, 21 insertions, 16 deletions
diff --git a/sources/pyside6/tests/QtUiTools/bug_1060.py b/sources/pyside6/tests/QtUiTools/bug_1060.py
index 317e33345..c84268cb3 100644
--- a/sources/pyside6/tests/QtUiTools/bug_1060.py
+++ b/sources/pyside6/tests/QtUiTools/bug_1060.py
@@ -36,7 +36,6 @@ 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.QtWidgets import QApplication
 from PySide6.QtUiTools import QUiLoader
 
@@ -51,5 +50,7 @@ class MyQUiLoader(QUiLoader):
 if __name__ == "__main__":
     app = QApplication([])
 
-    ui = MyQUiLoader().load(adjust_filename("bug_1060.ui", __file__))
+    file = Path(__file__).resolve().parent / 'bug_1060.ui'
+    assert(file.is_file())
+    ui = MyQUiLoader().load(os.fspath(file))
     ui.show()
diff --git a/sources/pyside6/tests/QtUiTools/bug_552.py b/sources/pyside6/tests/QtUiTools/bug_552.py
index 8d4ca4536..a4c8ae630 100644
--- a/sources/pyside6/tests/QtUiTools/bug_552.py
+++ b/sources/pyside6/tests/QtUiTools/bug_552.py
@@ -35,7 +35,6 @@ 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 import QtWidgets, QtCore
 from PySide6.QtUiTools import QUiLoader
 
@@ -44,7 +43,9 @@ class View_1(QtWidgets.QWidget):
     def __init__(self):
         QtWidgets.QWidget.__init__(self)
         loader = QUiLoader()
-        widget = loader.load(adjust_filename('bug_552.ui', __file__), self)
+        file = Path(__file__).resolve().parent / 'bug_552.ui'
+        assert(file.is_file())
+        widget = loader.load(os.fspath(file), self)
         self.children = []
         for child in widget.findChildren(QtCore.QObject, None):
             self.children.append(child)
diff --git a/sources/pyside6/tests/QtUiTools/bug_797.py b/sources/pyside6/tests/QtUiTools/bug_797.py
index 8956c31b0..6bcb318da 100644
--- a/sources/pyside6/tests/QtUiTools/bug_797.py
+++ b/sources/pyside6/tests/QtUiTools/bug_797.py
@@ -35,8 +35,6 @@ 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 import QtUiTools
 from PySide6 import QtCore
 from PySide6 import QtWidgets
@@ -44,7 +42,9 @@ from PySide6 import QtWidgets
 
 app = QtWidgets.QApplication([])
 loader = QtUiTools.QUiLoader()
-file = QtCore.QFile(adjust_filename('bug_552.ui', __file__))
+file = Path(__file__).resolve().parent / 'bug_552.ui'
+assert(file.is_file())
+file = QtCore.QFile(os.fspath(file))
 w = QtWidgets.QWidget()
 # An exception can't be thrown
 mainWindow = loader.load(file, w)
diff --git a/sources/pyside6/tests/QtUiTools/bug_909.py b/sources/pyside6/tests/QtUiTools/bug_909.py
index 8aab7d27a..ce963f31f 100644
--- a/sources/pyside6/tests/QtUiTools/bug_909.py
+++ b/sources/pyside6/tests/QtUiTools/bug_909.py
@@ -40,11 +40,12 @@ from PySide6.QtWidgets import QTabWidget
 from PySide6.QtUiTools import QUiLoader
 
 from helper.usesqapplication import UsesQApplication
-from helper.helper import adjust_filename
 
 class TestDestruction(UsesQApplication):
     def testBug909(self):
-        fileName = QFile(adjust_filename('bug_909.ui', __file__))
+        file = Path(__file__).resolve().parent / 'bug_909.ui'
+        self.assertTrue(file.is_file())
+        fileName = QFile(os.fspath(file))
         loader = QUiLoader()
         main_win = loader.load(fileName)
         self.assertEqual(sys.getrefcount(main_win), 2)
diff --git a/sources/pyside6/tests/QtUiTools/bug_913.py b/sources/pyside6/tests/QtUiTools/bug_913.py
index 637769daa..69012e165 100644
--- a/sources/pyside6/tests/QtUiTools/bug_913.py
+++ b/sources/pyside6/tests/QtUiTools/bug_913.py
@@ -38,8 +38,6 @@ 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 *
 from PySide6.QtWidgets import *
 from PySide6.QtUiTools import *
@@ -50,7 +48,9 @@ class TestBug913 (unittest.TestCase):
         app = QApplication([])
 
         loader = QUiLoader()
-        widget = loader.load(adjust_filename('bug_913.ui', __file__))
+        file = Path(__file__).resolve().parent / 'bug_913.ui'
+        self.assertTrue(file.is_file())
+        widget = loader.load(os.fspath(file))
         widget.tabWidget.currentIndex() # direct child is available as member
         widget.le_first.setText('foo') # child of QTabWidget must also be available!
 
diff --git a/sources/pyside6/tests/QtUiTools/bug_958.py b/sources/pyside6/tests/QtUiTools/bug_958.py
index 5084a1262..f5cd57ba3 100644
--- a/sources/pyside6/tests/QtUiTools/bug_958.py
+++ b/sources/pyside6/tests/QtUiTools/bug_958.py
@@ -36,7 +36,6 @@ from init_paths import init_test_paths
 init_test_paths(False)
 
 from PySide6 import QtWidgets, QtUiTools
-from helper.helper import adjust_filename
 from helper.timedqapplication import TimedQApplication
 
 class Gui_Qt(QtWidgets.QMainWindow):
@@ -46,7 +45,9 @@ class Gui_Qt(QtWidgets.QMainWindow):
         lLoader = QtUiTools.QUiLoader()
 
         # this used to cause a segfault because the old inject code used to destroy the parent layout
-        self._cw = lLoader.load(adjust_filename('bug_958.ui', __file__),  self)
+        file = Path(__file__).resolve().parent / 'bug_958.ui'
+        assert(file.is_file())
+        self._cw = lLoader.load(os.fspath(file),  self)
 
         self.setCentralWidget(self._cw)
 
diff --git a/sources/pyside6/tests/QtUiTools/bug_965.py b/sources/pyside6/tests/QtUiTools/bug_965.py
index 98fe2fa28..82afe7d76 100644
--- a/sources/pyside6/tests/QtUiTools/bug_965.py
+++ b/sources/pyside6/tests/QtUiTools/bug_965.py
@@ -38,7 +38,6 @@ init_test_paths(False)
 from PySide6.QtUiTools import QUiLoader
 
 from helper.usesqapplication import UsesQApplication
-from helper.helper import adjust_filename
 
 class MyQUiLoader(QUiLoader):
     def __init__(self):
@@ -50,7 +49,9 @@ class MyQUiLoader(QUiLoader):
 class BugTest(UsesQApplication):
     def testCase(self):
         loader = MyQUiLoader()
-        self.assertRaises(RuntimeError, loader.load, adjust_filename('bug_965.ui', __file__))
+        file = Path(__file__).resolve().parent / 'bug_965.ui'
+        self.assertTrue(file.is_file())
+        self.assertRaises(RuntimeError, loader.load, os.fspath(file))
 
 if __name__ == '__main__':
     unittest.main()