Mercurial Repositories > eric / file diff

diff -r d88e53da6e66 -r 1afb90182258 eric7/UI/UserInterface.py
--- a/eric7/UI/UserInterface.py	Wed May 18 09:19:09 2022 +0200
+++ b/eric7/UI/UserInterface.py	Wed May 18 10:54:32 2022 +0200
@@ -6835,7 +6835,7 @@
             if testing:
                 # clear the unit test histories
                 if self.__testingWidget is None:
-                    from Testing.UnittestWidget import clearSavedHistories
+                    from Testing.TestingWidget import clearSavedHistories
                     clearSavedHistories()
                 else:
                     self.__testingWidget.clearRecent()
@@ -6858,12 +6858,12 @@
         """
         Private slot to handle the projectOpened signal.
         """
-        from Debugger.DebugClientCapabilities import HasUnittest
+        import Testing
         self.__setWindowCaption(project=self.project.name)
-        cap = self.__debugServer.getClientCapabilities(
+        supported = Testing.isLanguageSupported(
             self.project.getProjectLanguage())
-        self.testProjectAct.setEnabled(cap & HasUnittest)
-        self.__testingProjectOpen = cap & HasUnittest
+        self.testProjectAct.setEnabled(supported)
+        self.__testingProjectOpen = supported
         
     def __projectClosed(self):
         """
@@ -6912,17 +6912,10 @@
             len(self.__menus["wizards"].actions()) > 0)
         
         if fn and str(fn) != "None":
-            dbs = self.__debugServer
-            for language in dbs.getSupportedLanguages():
-                exts = dbs.getExtensions(language)
-                if fn.endswith(exts):
-                    from Debugger.DebugClientCapabilities import HasUnittest
-                    cap = dbs.getClientCapabilities(language)
-                    self.testScriptAct.setEnabled(cap & HasUnittest)
-                    self.__testingEditorOpen = cap & HasUnittest
-                    return
-            
-            if self.viewmanager.getOpenEditor(fn).isPyFile():
+            import Testing
+            if Testing.isLanguageSupported(
+                self.viewmanager.getOpenEditor(fn).getFileType()
+            ):
                 self.testScriptAct.setEnabled(True)
                 self.__testingEditorOpen = True
         
@@ -6935,17 +6928,8 @@
         fn = editor.getFileName() if editor else None
         
         if fn:
-            dbs = self.__debugServer
-            for language in dbs.getSupportedLanguages():
-                exts = dbs.getExtensions(language)
-                if fn.endswith(exts):
-                    from Debugger.DebugClientCapabilities import HasUnittest
-                    cap = dbs.getClientCapabilities(language)
-                    self.testScriptAct.setEnabled(cap & HasUnittest)
-                    self.__testingEditorOpen = cap & HasUnittest
-                    return
-            
-            if editor.isPyFile():
+            import Testing
+            if Testing.isLanguageSupported(editor.getFileType()):
                 self.testScriptAct.setEnabled(True)
                 self.__testingEditorOpen = True
                 return