eric: comparison eric7/PyUnit/UnittestDialog.py

-:9c9779b7142a
+:52454036c2b2
 import time
 import re
 import os
 import contextlib
-from PyQt6.QtCore import pyqtSignal, QEvent, Qt, pyqtSlot
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent, QFileInfo
 from PyQt6.QtGui import QColor
 from PyQt6.QtWidgets import (
 QWidget, QDialog, QApplication, QDialogButtonBox, QListWidgetItem,
 QComboBox, QTreeWidgetItem
 )
 from .Ui_UnittestDialog import Ui_UnittestDialog
 import UI.PixmapCache
 import Preferences
+from Globals import (
+recentNameUnittestDiscoverHistory, recentNameUnittestFileHistory,
+recentNameUnittestTestnameHistory
+)
 class UnittestDialog(QWidget, Ui_UnittestDialog):
 """
 Class implementing the UI to the pyunit package.
 super().__init__(parent)
 if name:
 self.setObjectName(name)
 self.setupUi(self)
+self.clearHistoriesButton.setIcon(
+UI.PixmapCache.getIcon("clearPrivateData"))
 self.testsuitePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
 self.testsuitePicker.setInsertPolicy(
 QComboBox.InsertPolicy.InsertAtTop)
 self.testsuitePicker.setSizeAdjustPolicy(
 QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
 self.discoveryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
 self.discoveryPicker.setInsertPolicy(
 QComboBox.InsertPolicy.InsertAtTop)
 self.discoveryPicker.setSizeAdjustPolicy(
 QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
+self.testComboBox.lineEdit().setClearButtonEnabled(True)
 self.discoverButton = self.buttonBox.addButton(
 self.tr("Discover"), QDialogButtonBox.ButtonRole.ActionRole)
 self.discoverButton.setToolTip(self.tr(
 "Discover tests"))
 self.discoverButton.setWhatsThis(self.tr(
 """<b>Discover</b>"""
 """<p>This button starts a discovery of available tests.</p>"""))
 self.startButton = self.buttonBox.addButton(
 self.tr("Start"), QDialogButtonBox.ButtonRole.ActionRole)
 self.startButton.setToolTip(self.tr(
 "Start the selected testsuite"))
 self.startButton.setWhatsThis(self.tr(
 """<b>Start Test</b>"""
 """<p>This button starts the selected testsuite.</p>"""))
 self.startFailedButton = self.buttonBox.addButton(
 self.tr("Rerun Failed"), QDialogButtonBox.ButtonRole.ActionRole)
 self.startFailedButton.setToolTip(
 self.tr("Reruns failed tests of the selected testsuite"))
 self.startFailedButton.setWhatsThis(self.tr(
 """<b>Rerun Failed</b>"""
 """<p>This button reruns all failed tests of the selected"""
 """ testsuite.</p>"""))
 self.stopButton = self.buttonBox.addButton(
 self.tr("Stop"), QDialogButtonBox.ButtonRole.ActionRole)
 self.stopButton.setToolTip(self.tr("Stop the running unittest"))
 self.stopButton.setWhatsThis(self.tr(
 """<b>Stop Test</b>"""
 """<p>This button stops a running unittest.</p>"""))
 self.discoverButton.setEnabled(False)
 self.stopButton.setEnabled(False)
 self.startButton.setDefault(True)
 self.startFailedButton.setEnabled(False)
 self.testNameHistory = []
 self.running = False
 self.savedModulelist = None
 self.savedSysPath = sys.path
 self.savedCwd = os.getcwd()
-if prog:
-self.insertProg(prog)
 self.rxPatterns = [
 self.tr("^Failure: "),
 self.tr("^Error: "),
 # These are for untranslated/partially translated situations
 self.__dbs.utTestFailedExpected.connect(self.testFailedExpected)
 self.__dbs.utTestSucceededUnexpected.connect(
 self.testSucceededUnexpected)
 self.__editors = []
+self.__loadRecent()
+self.insertProg(prog)
+self.insertTestName("")
+self.clearHistoriesButton.clicked.connect(self.clearRecent)
 def keyPressEvent(self, evt):
 """
 Protected slot to handle key press events.
 discoveryPicker object.
 @param start start directory name to be inserted
 @type str
 """
+current = self.discoveryPicker.currentText()
 # prepend the given directory to the discovery picker
 if start is None:
 start = ""
 if start in self.discoverHistory:
 self.discoverHistory.remove(start)
 self.discoverHistory.insert(0, start)
 self.discoveryPicker.clear()
 self.discoveryPicker.addItems(self.discoverHistory)
+if current:
+self.discoveryPicker.setText(current)
 def insertProg(self, prog):
 """
 Public slot to insert the filename prog into the testsuitePicker
 object.
 @param prog filename to be inserted (string)
 """
+current = self.testsuitePicker.currentText()
 # prepend the selected file to the testsuite picker
 if prog is None:
 prog = ""
 if prog in self.fileHistory:
 self.fileHistory.remove(prog)
 self.fileHistory.insert(0, prog)
 self.testsuitePicker.clear()
 self.testsuitePicker.addItems(self.fileHistory)
+if current:
+self.testsuitePicker.setText(current)
 def insertTestName(self, testName):
 """
 Public slot to insert a test name into the testComboBox object.
 @param testName name of the test to be inserted (string)
 """
+current = self.testComboBox.currentText()
 # prepend the selected file to the testsuite combobox
 if testName is None:
 testName = ""
 if testName in self.testNameHistory:
 self.testNameHistory.remove(testName)
 self.testNameHistory.insert(0, testName)
 self.testComboBox.clear()
 self.testComboBox.addItems(self.testNameHistory)
+if current:
+self.testComboBox.setCurrentText(current)
 @pyqtSlot()
 def on_testsuitePicker_aboutToShowPathPickerDialog(self):
 """
 Private slot called before the test suite selection dialog is shown.
 @param button button that was clicked (QAbstractButton)
 """
 if button == self.discoverButton:
 self.__discover()
+self.__saveRecent()
 elif button == self.startButton:
 self.startTests()
+self.__saveRecent()
 elif button == self.stopButton:
 self.__stopTests()
 elif button == self.startFailedButton:
 self.startTests(failedOnly=True)
+def __loadRecent(self):
+"""
+Private method to load the most recently used lists.
+"""
+Preferences.Prefs.rsettings.sync()
+# 1. discovery history
+self.discoverHistory = []
+rs = Preferences.Prefs.rsettings.value(
+recentNameUnittestDiscoverHistory)
+if rs is not None:
+recent = [f
+for f in Preferences.toList(rs)
+if QFileInfo(f).exists()]
+self.discoverHistory = recent[
+:Preferences.getDebugger("RecentNumber")]
+# 2. test file history
+self.fileHistory = []
+rs = Preferences.Prefs.rsettings.value(
+recentNameUnittestFileHistory)
+if rs is not None:
+recent = [f
+for f in Preferences.toList(rs)
+if QFileInfo(f).exists()]
+self.fileHistory = recent[
+:Preferences.getDebugger("RecentNumber")]
+# 3. test name history
+self.testNameHistory = []
+rs = Preferences.Prefs.rsettings.value(
+recentNameUnittestTestnameHistory)
+if rs is not None:
+recent = [n for n in Preferences.toList(rs) if n]
+self.testNameHistory = recent[
+:Preferences.getDebugger("RecentNumber")]
+def __saveRecent(self):
+"""
+Private method to save the most recently used lists.
+"""
+Preferences.Prefs.rsettings.setValue(
+recentNameUnittestDiscoverHistory, self.discoverHistory)
+Preferences.Prefs.rsettings.setValue(
+recentNameUnittestFileHistory, self.fileHistory)
+Preferences.Prefs.rsettings.setValue(
+recentNameUnittestTestnameHistory, self.testNameHistory)
+Preferences.Prefs.rsettings.sync()
+@pyqtSlot()
+def clearRecent(self):
+"""
+Public slot to clear the recently used lists.
+"""
+# clear histories
+self.discoverHistory = []
+self.fileHistory = []
+self.testNameHistory = []
+# clear widgets with histories
+self.discoveryPicker.clear()
+self.testsuitePicker.clear()
+self.testComboBox.clear()
+# sync histories
+self.__saveRecent()
 @pyqtSlot()
 def __discover(self):
 """
 Private slot to discover unit test but don't run them.
 """
 return
 self.discoveryList.clear()
 discoveryStart = self.discoveryPicker.currentText()
+self.insertDiscovery(discoveryStart)
 self.sbLabel.setText(self.tr("Discovering Tests"))
 QApplication.processEvents()
 self.testName = self.tr("Unittest with auto-discovery")
 if self.__dbs:
 discover = self.discoverCheckBox.isChecked()
 if discover:
 discoveryStart = self.discoveryPicker.currentText()
 testFileName = ""
 testName = ""
+if discoveryStart:
+self.insertDiscovery(discoveryStart)
 else:
 discoveryStart = ""
 testFileName = self.testsuitePicker.currentText()
 testName = self.testComboBox.currentText()
 if testName:
 if event.type() == QEvent.Type.Close:
 QApplication.exit()
 return True
 return False
+def clearSavedHistories(self):
+"""
+Function to clear the saved history lists.
+"""
+Preferences.Prefs.rsettings.setValue(
+recentNameUnittestDiscoverHistory, [])
+Preferences.Prefs.rsettings.setValue(
+recentNameUnittestFileHistory, [])
+Preferences.Prefs.rsettings.setValue(
+recentNameUnittestTestnameHistory, [])
+Preferences.Prefs.rsettings.sync()

Mercurial Repositories > eric / file comparison

comparison: eric7/PyUnit/UnittestDialog.py

eric7/PyUnit/UnittestDialog.py