Refactored Unit Test Startup and Teardown (#916)

* Refactored Unit Test Start

* Fixed Flake8

* Added group_name setter and corrected group_name getter

* Added group_name setter and corrected group_name getter

Co-authored-by: maxcapodi78 <Shark78>

Author: maxcapodi78

_unittest/conftest.py

@@ -85,27 +85,40 @@ def my_setup(self):
         self.aedtapps = []
         self.edbapps = []
 
-    def my_teardown(self):
-        try:
-            oDesktop = sys.modules["__main__"].oDesktop
-        except Exception as e:
-            oDesktop = None
-        if oDesktop:
-            oDesktop.ClearMessages("", "", 3)
-        for edbapp in self.edbapps[::-1]:
-            try:
-                edbapp.close_edb()
-            except:
-                pass
-        del self.edbapps
-        for aedtapp in self.aedtapps[::-1]:
+    def my_teardown(self, close_desktop=False):
+        if close_desktop and not is_ironpython:
+            if self.aedtapps:
+                self.aedtapps[0].release_desktop()
+            else:
+                d = Desktop(desktop_version, non_graphical, False)
+                d.release_desktop()
+                del d
+            del self.aedtapps
+            del self.edbapps
+        else:
             try:
-                aedtapp.close_project(None, False)
-            except:
-                pass
-        del self.aedtapps
+                oDesktop = sys.modules["__main__"].oDesktop
+            except Exception as e:
+                oDesktop = None
+            if oDesktop:
+                oDesktop.ClearMessages("", "", 3)
+            for edbapp in self.edbapps[::-1]:
+                try:
+                    edbapp.close_edb()
+                except:
+                    pass
+            del self.edbapps
+            for aedtapp in self.aedtapps[::-1]:
+                try:
+                    aedtapp.close_project(None, False)
+                except:
+                    pass
+            del self.aedtapps
 
     def add_app(self, project_name=None, design_name=None, solution_type=None, application=None):
+        if "oDesktop" not in dir(sys.modules["__main__"]):
+            desktop = Desktop(desktop_version, non_graphical, new_thread)
+            desktop.disable_autosave()
         if project_name:
             example_project = os.path.join(local_path, "example_models", project_name + ".aedt")
             example_folder = os.path.join(local_path, "example_models", project_name + ".aedb")
@@ -172,16 +185,10 @@ def setup(self):
 
 @pytest.fixture(scope="session", autouse=True)
 def desktop_init():
-    desktop = Desktop(desktop_version, non_graphical, new_thread)
-    desktop.disable_autosave()
-    yield desktop
-
-    # If new_thread is set to false by a local_config, then don't close the desktop.
-    # Intended for local debugging purposes only
-    if new_thread or os.name == "posix":
-        desktop.close_desktop()
+
+    yield
+
     p = [x[0] for x in os.walk(scratch_path) if "scratch" in x[0]]
-    # p = pathlib.Path(scratch_path).glob('**/scratch*')
     for folder in p:
         shutil.rmtree(folder, ignore_errors=True)
 

_unittest/test_04_GeometryOperators.py renamed to _unittest/test_00_GeometryOperators.py

@@ -2,11 +2,9 @@
 import logging
 
 from pyaedt.application.MessageManager import AEDTMessageManager
-from pyaedt.generic.filesystem import Scratch
-from pyaedt.hfss import Hfss
 
 # Import required modules
-from _unittest.conftest import config, scratch_path, BasisTest, desktop_version
+from _unittest.conftest import config, BasisTest
 
 try:
     import pytest
@@ -19,36 +17,27 @@
 class TestClass(BasisTest, object):
     def setup_class(self):
         BasisTest.my_setup(self)
-        with Scratch(scratch_path) as self.local_scratch:
-
-            # Test the global _messenger before opening the desktop
-            msg = AEDTMessageManager()
-            msg.clear_messages()
-            msg.add_info_message("Test desktop level - Info")
-            msg.add_info_message("Test desktop level - Info", level="Design")
-            msg.add_info_message("Test desktop level - Info", level="Project")
-            msg.add_info_message("Test desktop level - Info", level="Global")
-            # assert len(msg.messages.global_level) == 4
-            # assert len(msg.messages.project_level) == 0
-            # assert len(msg.messages.design_level) == 0
-            # assert len(msg.messages.global_level) == 0
-            # assert len(msg.messages.project_level) == 0
-            # assert len(msg.messages.design_level) == 0
-            msg.clear_messages(level=0)
-
-            self.aedtapp = Hfss(specified_version=desktop_version)
-            msg.clear_messages(level=3)
+        # Test the global _messenger before opening the desktop
+        msg = AEDTMessageManager()
+        msg.clear_messages()
+        msg.add_info_message("Test desktop level - Info")
+        msg.add_info_message("Test desktop level - Info", level="Design")
+        msg.add_info_message("Test desktop level - Info", level="Project")
+        msg.add_info_message("Test desktop level - Info", level="Global")
+        # assert len(msg.messages.global_level) == 4
+        # assert len(msg.messages.project_level) == 0
+        # assert len(msg.messages.design_level) == 0
+        # assert len(msg.messages.global_level) == 0
+        # assert len(msg.messages.project_level) == 0
+        # assert len(msg.messages.design_level) == 0
+        msg.clear_messages(level=0)
+        BasisTest.add_app(self)
+        msg.clear_messages(level=3)
 
     def teardown_class(self):
         BasisTest.my_teardown(self)
 
-    def test_00_test_global_messenger(self):
-        # TODO: close_project causes a crash ... refactor the project/desktop stuff !
-        # self.aedtapp.close_project()
-        # self.aedtapp = Hfss()
-        pass
-
-    @pytest.mark.skipif(config["build_machine"] == True, reason="Issue on Build machine")
+    @pytest.mark.skipif(config["build_machine"], reason="Issue on Build machine")
     def test_01_get_messages(self):  # pragma: no cover
         msg = self.aedtapp._messenger
         msg.clear_messages(level=3)
@@ -60,7 +49,7 @@ def test_01_get_messages(self):  # pragma: no cover
         assert len(msg.messages.design_level) >= 1
         pass
 
-    @pytest.mark.skipif(config["build_machine"] == True, reason="Issue on Build machine")
+    @pytest.mark.skipif(config["build_machine"], reason="Issue on Build machine")
     def test_02_messaging(self):  # pragma: no cover
         msg = self.aedtapp._messenger
         msg.clear_messages(level=3)

_unittest/test_10_downloads.py renamed to _unittest/test_00_downloads.py

@@ -40,7 +40,7 @@ def setup_class(self):
         self.local_scratch.copyfile(project_path)
 
     def teardown_class(self):
-        BasisTest.my_teardown(self)
+        BasisTest.my_teardown(self, True)
 
     def test_01_save(self):
         self.aedtapp.save_project()