eric: comparison src/eric7/Testing/TestingWidget.py

-:f23c43e18046
+:906485dcd210
 import os
 from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent, QCoreApplication
 from PyQt6.QtWidgets import QAbstractButton, QComboBox, QDialogButtonBox, QWidget
-from EricWidgets import EricMessageBox
+from eric7.EricWidgets import EricMessageBox
-from EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricApplication import ericApp
-from EricWidgets.EricMainWindow import EricMainWindow
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
 from .Ui_TestingWidget import Ui_TestingWidget
 from .TestResultsTree import TestResultsModel, TestResultsTreeView
 from .Interfaces import Frameworks
 from .Interfaces.TestExecutorBase import TestConfig, TestResult, TestResultCategory
 from .Interfaces.TestFrameworkRegistry import TestFrameworkRegistry
-import Preferences
+from eric7 import Preferences
-import UI.PixmapCache
+from eric7.EricGui import EricPixmapCache
-from Globals import (
+from eric7.Globals import (
 recentNameTestDiscoverHistory,
 recentNameTestFileHistory,
 recentNameTestNameHistory,
 recentNameTestFramework,
 recentNameTestEnvironment,
 self.__resultsTree = TestResultsTreeView(self)
 self.__resultsTree.setModel(self.__resultsModel)
 self.__resultsTree.goto.connect(self.__showSource)
 self.resultsGroupBox.layout().addWidget(self.__resultsTree)
-self.versionsButton.setIcon(UI.PixmapCache.getIcon("info"))
+self.versionsButton.setIcon(EricPixmapCache.getIcon("info"))
-self.clearHistoriesButton.setIcon(UI.PixmapCache.getIcon("clearPrivateData"))
+self.clearHistoriesButton.setIcon(EricPixmapCache.getIcon("clearPrivateData"))
-self.showMarkersButton.setIcon(UI.PixmapCache.getIcon("select"))
+self.showMarkersButton.setIcon(EricPixmapCache.getIcon("select"))
 self.testsuitePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
 self.testsuitePicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop)
 self.testsuitePicker.setSizeAdjustPolicy(
 QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon
 )
 self.setWindowFlags(
 self.windowFlags() | Qt.WindowType.WindowContextHelpButtonHint
 )
-self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
+self.setWindowIcon(EricPixmapCache.getIcon("eric"))
 self.setWindowTitle(self.tr("Testing"))
 try:
 # we are called from within the eric IDE
 self.__venvManager = ericApp().getObject("VirtualEnvManager")
 self.__project = ericApp().getObject("Project")
 self.__project.projectOpened.connect(self.__projectOpened)
 self.__project.projectClosed.connect(self.__projectClosed)
+self.__projectEnvironmentMarker = self.tr("<project>")
 except KeyError:
 # we were called as a standalone application
-from VirtualEnv.VirtualenvManager import VirtualenvManager
+from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager
 self.__venvManager = VirtualenvManager(self)
 self.__venvManager.virtualEnvironmentAdded.connect(
 self.__populateVenvComboBox
 )
 self.__populateVenvComboBox
 )
 ericApp().registerObject("VirtualEnvManager", self.__venvManager)
 self.__project = None
+self.__projectEnvironmentMarker = ""
 self.__discoverHistory = []
 self.__fileHistory = []
 self.__testNameHistory = []
 self.__recentFramework = ""
 self.clearHistoriesButton.clicked.connect(self.clearRecent)
 self.tabWidget.setCurrentIndex(0)
+def __determineInterpreter(self, venvName):
+"""
+Private method to determine the interpreter to be used.
+@param venvName name of the virtual environment
+@type str
+@return path of the interpreter executable
+@rtype str
+"""
+if self.__project and venvName == self.__projectEnvironmentMarker:
+return self.__project.getProjectInterpreter()
+else:
+return self.__venvManager.getVirtualenvInterpreter(venvName)
 def __populateVenvComboBox(self):
 """
 Private method to (re-)populate the virtual environments selector.
 """
 currentText = self.venvComboBox.currentText()
 if not currentText:
 currentText = self.__recentEnvironment
 self.venvComboBox.clear()
 self.venvComboBox.addItem("")
+if self.__project and self.__project.isOpen():
+self.venvComboBox.addItem(self.__projectEnvironmentMarker)
 self.venvComboBox.addItems(sorted(self.__venvManager.getVirtualenvNames()))
 self.venvComboBox.setCurrentText(currentText)
 def __populateTestFrameworkComboBox(self):
 """
 currentText = self.__recentFramework
 self.frameworkComboBox.clear()
 if bool(self.venvComboBox.currentText()):
-interpreter = self.__venvManager.getVirtualenvInterpreter(
+interpreter = self.__determineInterpreter(self.venvComboBox.currentText())
-self.venvComboBox.currentText()
-)
 self.frameworkComboBox.addItem("")
 for index, (name, executor) in enumerate(
 sorted(self.__frameworkRegistry.getFrameworks().items()), start=1
 ):
 isInstalled = executor.isInstalled(interpreter)
 venvName = self.venvComboBox.currentText()
 if venvName:
 framework = self.frameworkComboBox.currentText()
 if framework:
-interpreter = self.__venvManager.getVirtualenvInterpreter(venvName)
+interpreter = self.__determineInterpreter(venvName)
 executor = self.__frameworkRegistry.createExecutor(framework, self)
 hasCoverage = executor.hasCoverage(interpreter)
 self.coverageCheckBox.setEnabled(hasCoverage)
 if not hasCoverage:
 venvName = self.venvComboBox.currentText()
 if venvName:
 framework = self.frameworkComboBox.currentText()
 if framework:
-interpreter = self.__venvManager.getVirtualenvInterpreter(venvName)
+interpreter = self.__determineInterpreter(venvName)
 executor = self.__frameworkRegistry.createExecutor(framework, self)
 supportsMarkers = executor.supportsMarkers(interpreter)
 # 1. marker expression line edit
 self.markerExpressionEdit.setEnabled(supportsMarkers)
 elif self.testsuitePicker.currentText():
 workdir = os.path.dirname(self.testsuitePicker.currentText())
 else:
 workdir = ""
-interpreter = self.__venvManager.getVirtualenvInterpreter(venvName)
+interpreter = self.__determineInterpreter(venvName)
 executor = self.__frameworkRegistry.createExecutor(framework, self)
 markers = executor.getMarkers(interpreter, workdir)
 if self.__markersWindow is None:
 from .MarkersWindow import MarkersWindow
 venvName = self.venvComboBox.currentText()
 if venvName:
 framework = self.frameworkComboBox.currentText()
 if framework:
-interpreter = self.__venvManager.getVirtualenvInterpreter(venvName)
+interpreter = self.__determineInterpreter(venvName)
 executor = self.__frameworkRegistry.createExecutor(framework, self)
 supportsPatterns = executor.supportsPatterns(interpreter)
 self.testNamePatternEdit.setEnabled(supportsPatterns)
 self.testNamePatternEdit.clear()
 """
 venvName = self.venvComboBox.currentText()
 if venvName:
 headerText = self.tr("<h3>Versions of Frameworks and their" " Plugins</h3>")
 versionsText = ""
-interpreter = self.__venvManager.getVirtualenvInterpreter(venvName)
+interpreter = self.__determineInterpreter(venvName)
 for framework in sorted(self.__frameworkRegistry.getFrameworks().keys()):
 executor = self.__frameworkRegistry.createExecutor(framework, self)
 versions = executor.getVersions(interpreter)
 if versions:
 txt = "<p><strong>{0} {1}</strong>".format(
 coverageFile = (
 os.path.splitext(mainScript)[0] + ".coverage" if mainScript else ""
 )
 else:
 coverageFile = ""
-interpreter = self.__venvManager.getVirtualenvInterpreter(
+interpreter = self.__determineInterpreter(self.__recentEnvironment)
-self.__recentEnvironment
-)
 config = TestConfig(
 interpreter=interpreter,
 discover=discover,
 discoveryStart=discoveryStart,
 testFilename=testFileName,
 """
 Private slot to show a code coverage dialog for the most recent test
 run.
 """
 if self.__coverageDialog is None:
-from DataViews.PyCoverageDialog import PyCoverageDialog
+from eric7.DataViews.PyCoverageDialog import PyCoverageDialog
 self.__coverageDialog = PyCoverageDialog(self)
 self.__coverageDialog.openFile.connect(self.__openEditor)
 testDir = (
 @pyqtSlot()
 def __showLogOutput(self):
 """
 Private slot to show the output of the most recent test run.
 """
-from EricWidgets.EricPlainTextDialog import EricPlainTextDialog
+from eric7.EricWidgets.EricPlainTextDialog import EricPlainTextDialog
 dlg = EricPlainTextDialog(
 title=self.tr("Test Run Output"), text=self.__recentLog
 )
 dlg.exec()
 @pyqtSlot()
 def __projectOpened(self):
 """
 Private slot to handle a project being opened.
 """
-self.venvComboBox.setCurrentText(self.__project.getProjectVenv())
+self.venvComboBox.insertItem(1, self.__projectEnvironmentMarker)
+self.venvComboBox.setCurrentIndex(1)
 self.frameworkComboBox.setCurrentText(
 self.__project.getProjectTestingFramework()
 )
 self.__insertDiscovery(self.__project.getProjectPath())
 @pyqtSlot()
 def __projectClosed(self):
 """
 Private slot to handle a project being closed.
 """
+self.venvComboBox.removeItem(1)  # <project> is always at index 1
 self.venvComboBox.setCurrentText("")
 self.frameworkComboBox.setCurrentText("")
 self.__insertDiscovery("")
 @pyqtSlot(str, int)
 @param filename path of the file to be opened
 @type str
 @param linenumber line number to place the cursor at (defaults to 1)
 @type int (optional)
 """
-from QScintilla.MiniEditor import MiniEditor
+from eric7.QScintilla.MiniEditor import MiniEditor
 editor = MiniEditor(filename, "Python3", self)
 editor.gotoLine(linenumber)
 editor.show()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Testing/TestingWidget.py

src/eric7/Testing/TestingWidget.py