diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/PyUnit/UnittestDialog.py
--- a/eric7/PyUnit/UnittestDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/PyUnit/UnittestDialog.py Sat May 22 18:51:46 2021 +0200
@@ -21,10 +21,10 @@
QComboBox, QTreeWidgetItem
)
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
-from E5Gui.E5MainWindow import E5MainWindow
-from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
+from E5Gui.EricMainWindow import EricMainWindow
+from E5Gui.EricPathPicker import EricPathPickerModes
from .Ui_UnittestDialog import Ui_UnittestDialog
@@ -77,13 +77,13 @@
self.setObjectName(name)
self.setupUi(self)
- self.testsuitePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
+ self.testsuitePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
self.testsuitePicker.setInsertPolicy(
QComboBox.InsertPolicy.InsertAtTop)
self.testsuitePicker.setSizeAdjustPolicy(
QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
- self.discoveryPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
+ self.discoveryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
self.discoveryPicker.setInsertPolicy(
QComboBox.InsertPolicy.InsertAtTop)
self.discoveryPicker.setSizeAdjustPolicy(
@@ -138,7 +138,7 @@
# virtual environment manager is only used in the integrated
# variant
- self.__venvManager = e5App().getObject("VirtualEnvManager")
+ self.__venvManager = ericApp().getObject("VirtualEnvManager")
self.__populateVenvComboBox()
self.__venvManager.virtualEnvironmentAdded.connect(
self.__populateVenvComboBox)
@@ -232,7 +232,7 @@
"""
self.__forProject = forProject
if forProject:
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if project.isOpen():
self.insertDiscovery(project.getProjectPath())
else:
@@ -312,7 +312,7 @@
if not defaultDirectory:
defaultDirectory = os.path.expanduser("~")
if self.__dbs:
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if self.__forProject and project.isOpen():
defaultDirectory = project.getProjectPath()
self.testsuitePicker.setDefaultDirectory(defaultDirectory)
@@ -350,7 +350,7 @@
if not bool(self.discoveryPicker.currentText()):
if self.__forProject:
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if project.isOpen():
self.insertDiscovery(project.getProjectPath())
return
@@ -391,7 +391,7 @@
venvName = self.venvComboBox.currentText()
# we are cooperating with the eric IDE
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if self.__forProject:
mainScript = project.getMainScript(True)
clientType = project.getProjectLanguage()
@@ -404,7 +404,7 @@
discoveryStart = workdir
else:
if not discoveryStart:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr("You must enter a start directory for"
@@ -420,7 +420,7 @@
else:
# we are running as an application
if not discoveryStart:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr("You must enter a start directory for"
@@ -448,7 +448,7 @@
testLoader = unittest.TestLoader()
test = testLoader.discover(discoveryStart)
if hasattr(testLoader, "errors") and bool(testLoader.errors):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr(
@@ -468,7 +468,7 @@
self.tabWidget.setCurrentIndex(0)
except Exception:
exc_type, exc_value, exc_tb = sys.exc_info()
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr(
@@ -624,7 +624,7 @@
len(testCases)))
self.tabWidget.setCurrentIndex(0)
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr("<p>Unable to discover tests.</p>"
@@ -690,7 +690,7 @@
testName = "suite"
if not discover and not testFileName and not testName:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr("You must select auto-discovery or enter a test suite"
@@ -720,7 +720,7 @@
testCases = self.__selectedTestCases()
if not testCases and self.discoveryList.topLevelItemCount():
- ok = E5MessageBox.yesNo(
+ ok = EricMessageBox.yesNo(
self,
self.tr("Unittest"),
self.tr("""No test case has been selected. Shall all"""
@@ -732,7 +732,7 @@
venvName = self.venvComboBox.currentText()
# we are cooperating with the eric IDE
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
if self.__forProject:
mainScript = project.getMainScript(True)
clientType = project.getProjectLanguage()
@@ -748,7 +748,7 @@
else:
if discover:
if not discoveryStart:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr("You must enter a start directory for"
@@ -787,7 +787,7 @@
else:
# we are running as an application
if discover and not discoveryStart:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr("You must enter a start directory for"
@@ -849,7 +849,7 @@
testName, module)
except Exception:
exc_type, exc_value, exc_tb = sys.exc_info()
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr(
@@ -881,7 +881,7 @@
self, self.failfastCheckBox.isChecked())
self.totalTests = test.countTestCases()
if self.totalTests == 0:
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Unittest"),
self.tr("""No unittest were found. Aborting..."""))
@@ -909,7 +909,7 @@
@param exc_value value of exception occured during preparation (string)
"""
if nrTests == 0:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Unittest"),
self.tr(
@@ -1066,7 +1066,7 @@
self.skippedCount += 1
self.progressCounterSkippedCount.setText(str(self.skippedCount))
itm = QListWidgetItem(self.tr(" Skipped: {0}").format(reason))
- if e5App().usesDarkPalette():
+ if ericApp().usesDarkPalette():
itm.setForeground(self.SkippedColorDarkTheme)
else:
itm.setForeground(self.SkippedColorLightTheme)
@@ -1084,7 +1084,7 @@
self.progressCounterExpectedFailureCount.setText(
str(self.expectedFailureCount))
itm = QListWidgetItem(self.tr(" Expected Failure"))
- if e5App().usesDarkPalette():
+ if ericApp().usesDarkPalette():
itm.setForeground(self.FailedExpectedColorDarkTheme)
else:
itm.setForeground(self.FailedExpectedColorLightTheme)
@@ -1101,7 +1101,7 @@
self.progressCounterUnexpectedSuccessCount.setText(
str(self.unexpectedSuccessCount))
itm = QListWidgetItem(self.tr(" Unexpected Success"))
- if e5App().usesDarkPalette():
+ if ericApp().usesDarkPalette():
itm.setForeground(self.SucceededUnexpectedColorDarkTheme)
else:
itm.setForeground(self.SucceededUnexpectedColorLightTheme)
@@ -1330,7 +1330,7 @@
self.parent.testFinished()
-class UnittestWindow(E5MainWindow):
+class UnittestWindow(EricMainWindow):
"""
Main window class for the standalone dialog.
"""
