eric: comparison PyUnit/UnittestDialog.py

-:060a30488316
+:f2c774c8db7e
 self.discoveryPicker.setMode(E5PathPickerModes.DirectoryMode)
 self.discoveryPicker.setInsertPolicy(QComboBox.InsertAtTop)
 self.discoveryPicker.setSizeAdjustPolicy(
 QComboBox.AdjustToMinimumContentsLength)
-# TODO: add a "Discover" button enabled upon selection of 'auto-discovery'
 self.discoverButton = self.buttonBox.addButton(
 self.tr("Discover"), QDialogButtonBox.ActionRole)
 self.discoverButton.setToolTip(self.tr(
 "Discover tests"))
 self.discoverButton.setWhatsThis(self.tr(
 self.__failedTests = []
 # now connect the debug server signals if called from the eric6 IDE
 if self.__dbs:
+self.__dbs.utDiscovered.connect(self.__UTDiscovered)
 self.__dbs.utPrepared.connect(self.__UTPrepared)
 self.__dbs.utFinished.connect(self.__setStoppedMode)
 self.__dbs.utStartTest.connect(self.testStarted)
 self.__dbs.utStopTest.connect(self.testFinished)
 self.__dbs.utTestFailed.connect(self.testFailed)
 self.insertDiscovery(project.getProjectPath())
 else:
 self.insertDiscovery("")
 else:
 self.insertDiscovery("")
+self.discoveryList.clear()
+self.tabWidget.setCurrentIndex(0)
 def insertDiscovery(self, start):
 """
 Public slot to insert the discovery start directory into the
 discoveryPicker object.
 self.sbLabel.setText(self.tr("Discovering Tests"))
 QApplication.processEvents()
 self.testName = self.tr("Unittest with auto-discovery")
 if self.__dbs:
-# TODO: implement this later
+venvName = self.venvComboBox.currentText()
-pass
+# we are cooperating with the eric6 IDE
+project = e5App().getObject("Project")
+if self.__forProject:
+mainScript = os.path.abspath(project.getMainScript(True))
+clientType = project.getProjectLanguage()
+if mainScript:
+workdir = os.path.dirname(mainScript)
+else:
+workdir = project.getProjectPath()
+sysPath = [workdir]
+if not discoveryStart:
+discoveryStart = workdir
+else:
+if not discoveryStart:
+E5MessageBox.critical(
+self,
+self.tr("Unittest"),
+self.tr("You must enter a start directory for"
+" auto-discovery."))
+return
+workdir = ""
+clientType = \
+self.__venvManager.getVirtualenvVariant(venvName)
+if not clientType:
+# assume Python 3
+clientType = "Python3"
+self.__dbs.remoteUTDiscover(clientType, self.__forProject,
+workdir, venvName, sysPath,
+discoveryStart)
 else:
 # we are running as an application
 if not discoveryStart:
 E5MessageBox.critical(
 self,
 # now try to discover the testsuite
 os.chdir(discoveryStart)
 try:
 testLoader = unittest.TestLoader()
 test = testLoader.discover(discoveryStart)
-if test:
+if hasattr(testLoader, "errors") and \
-if hasattr(testLoader, "errors") and \
+bool(testLoader.errors):
-bool(testLoader.errors):
+E5MessageBox.critical(
-E5MessageBox.critical(
+self,
-self,
+self.tr("Unittest"),
-self.tr("Unittest"),
+self.tr(
-self.tr(
+"<p>Unable to discover tests.</p>"
-"<p>Unable to discover tests.</p>"
+"<p>{0}</p>"
-"<p>{0}</p>"
+).format("<br/>".join(testLoader.errors)
-).format("<br/>".join(testLoader.errors)
+.replace("\n", "<br/>"))
-.replace("\n", "<br/>"))
+)
-)
+self.sbLabel.clear()
-self.sbLabel.clear()
+else:
-else:
+testsList = self.__assembleTestCasesList(test)
-testsList = self.__assembleTestCasesList(test)
+self.__populateDiscoveryResults(testsList)
-self.__populateDiscoveryResults(testsList)
+self.sbLabel.setText(
-self.sbLabel.setText(
+self.tr("Discovered %n Test(s)", "",
-self.tr("Discovered %n Test(s)", "",
+len(testsList)))
-len(testsList)))
+self.tabWidget.setCurrentIndex(0)
-self.tabWidget.setCurrentIndex(0)
 except Exception:
 exc_type, exc_value, exc_tb = sys.exc_info()
 E5MessageBox.critical(
 self,
 self.tr("Unittest"),
 itm.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
 itm.setCheckState(0, Qt.Unchecked)
 itm.setData(0, Qt.UserRole, modulePath)
 pitm = itm
+def __selectedTestCases(self, parent=None):
+"""
+Private method to assemble the list of selected test cases and suites.
+@param parent reference to the parent item
+@type QTreeWidgetItem
+@return list of selected test cases
+@rtype list of str
+"""
+selectedTests = []
+if parent is None:
+# top level
+for index in range(self.discoveryList.topLevelItemCount()):
+itm = self.discoveryList.topLevelItem(index)
+if itm.checkState(0) == Qt.Checked:
+selectedTests.append(itm.data(0, Qt.UserRole))
+# ignore children because they are included implicitly
+elif itm.childCount():
+# recursively check children
+selectedTests.extend(self.__selectedTestCases(itm))
+else:
+# parent item with children
+for index in range(parent.childCount()):
+itm = parent.child(index)
+if itm.checkState(0) == Qt.Checked:
+selectedTests.append(itm.data(0, Qt.UserRole))
+# ignore children because they are included implicitly
+elif itm.childCount():
+# recursively check children
+selectedTests.extend(self.__selectedTestCases(itm))
+return selectedTests
+def __UTDiscovered(self, testCases, exc_type, exc_value):
+"""
+Private slot to handle the utPrepared signal.
+If the unittest suite was loaded successfully, we ask the
+client to run the test suite.
+@param testCases list of detected test cases
+@type str
+@param exc_type exception type occured during discovery
+@type str
+@param exc_value value of exception occured during discovery
+@type str
+"""
+if testCases:
+self.__populateDiscoveryResults(testCases)
+self.sbLabel.setText(
+self.tr("Discovered %n Test(s)", "",
+len(testCases)))
+self.tabWidget.setCurrentIndex(0)
+else:
+E5MessageBox.critical(
+self,
+self.tr("Unittest"),
+self.tr("<p>Unable to discover tests.</p>"
+"<p>{0}<br>{1}</p>")
+.format(exc_type, exc_value.replace("\n", "<br/>"))
+)
 @pyqtSlot()
 def startTests(self, failedOnly=False):
 """
 Public slot to start the test.
 os.path.basename(testFileName))[0]
 elif testName:
 self.testName = testName
 else:
 self.testName = self.tr("<Unnamed Test>")
+if failedOnly:
+testCases = []
+else:
+testCases = self.__selectedTestCases()
 if self.__dbs:
 venvName = self.venvComboBox.currentText()
 # we are cooperating with the eric6 IDE
 testFileName, self.testName, testName, failed,
 self.coverageCheckBox.isChecked(), coverageFile,
 self.coverageEraseCheckBox.isChecked(), clientType=clientType,
 forProject=self.__forProject, workdir=workdir,
 venvName=venvName, syspath=sysPath,
-discover=discover, discoveryStart=discoveryStart)
+discover=discover, discoveryStart=discoveryStart,
+testCases=testCases)
 else:
 # we are running as an application
 if discover and not discoveryStart:
 E5MessageBox.critical(
 self,
 os.chdir(discoveryStart)
 discover = False
 else:
 failed = []
 if discover:
-test = testLoader.discover(discoveryStart)
+if testCases:
+test = testLoader.loadTestsFromNames(testCases)
+else:
+test = testLoader.discover(discoveryStart)
 else:
 if testFileName:
 module = __import__(self.testName)
 else:
 module = None

Mercurial Repositories > eric / file comparison

comparison: PyUnit/UnittestDialog.py

PyUnit/UnittestDialog.py