FIX: Improve extension unit tests using ANSYS-HSD_V1 file (#6043)

Co-authored-by: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com>

Author: Samuelopez-ansys

doc/changelog.d/6043.fixed.md

@@ -0,0 +1 @@
+Improve extension unit tests using ANSYS-HSD_V1 file

src/ansys/aedt/core/workflows/hfss/choke_designer.py

@@ -494,6 +494,9 @@ def main(extension_args):
     if temp_dir.exists():
         shutil.rmtree(temp_dir, ignore_errors=True)
 
+    if extension_args["is_test"]:
+        hfss.close_project()
+
     if not extension_args["is_test"]:  # pragma: no cover
         app.release_desktop(False, False)
     return True

src/ansys/aedt/core/workflows/hfss3dlayout/cutout.py

@@ -290,10 +290,8 @@ def main(extension_args):
         edb.nets.find_and_fix_disjoint_nets(reference)
     edb.close_edb()
 
-    # Open layout in HFSS 3D Layout
-    Hfss3dLayout(str(new_path))
-
     if not extension_args["is_test"]:  # pragma: no cover
+        Hfss3dLayout(str(new_path))
         app.logger.info("Project generated correctly.")
         app.release_desktop(False, False)
     return True

src/ansys/aedt/core/workflows/hfss3dlayout/post_layout_design_toolkit.py

@@ -98,7 +98,7 @@ def callback(self):
                 self.selection_var.set("Please select two vias")
                 return
 
-            h3d = self.master_ui.get_h3d
+            h3d = self.master_ui.get_h3d()
             backend = BackendAntipad(h3d)
             backend.create(
                 selected,
@@ -149,7 +149,8 @@ def create_ui(self, master):
 
         def get_padstack_def(self):
             self.master_ui.get_selections(self.selection_var)
-            pedb = self.master_ui.get_h3d.modeler.primitives.edb
+            h3d = self.master_ui.get_h3d()
+            pedb = h3d.modeler.primitives.edb
             temp = []
             selected = self.selection_var.get().split(",")
             for i in selected:
@@ -163,7 +164,7 @@ def get_padstack_def(self):
         def callback(self):
             selected = self.selection_var.get().split(",")
 
-            h3d = self.master_ui.get_h3d
+            h3d = self.master_ui.get_h3d()
             backend = BackendMircoVia(h3d)
             new_edb_path = backend.create(
                 selected,
@@ -188,7 +189,6 @@ def active_design(self):
         if odesign.GetDesignType() in ["HFSS 3D Layout Design"]:
             return desktop, oproject, odesign
 
-    @property
     def get_h3d(self):
         _, oproject, odesign = self.active_design
         project_name = oproject.GetName()

src/ansys/aedt/core/workflows/hfss3dlayout/via_clustering_extension.py

@@ -241,9 +241,10 @@ def main(extension_arguments):
         prim.delete()
     edb.save()
     edb.close_edb()
-    h3d = Hfss3dLayout(new_aedb_path)
-    h3d.logger.info("Project generated correctly.")
+
     if not test_mode:
+        h3d = Hfss3dLayout(new_aedb_path)
+        h3d.logger.info("Project generated correctly.")
         h3d.release_desktop(False, False)
     return True
 

src/ansys/aedt/core/workflows/project/configure_edb.py

@@ -338,6 +338,7 @@ def execute_export(self, file_path):
 
 class ConfigureEdbBackend:
     def __init__(self, args, is_test=False):
+        self.is_test = is_test
         if len(args["siwave_load"]):  # pragma: no cover
             for i in args["siwave_load"]:
                 self.execute_load_cfg_siw(**i)
@@ -381,17 +382,16 @@ def execute_load_cfg_siw(project_file, file_cfg_path, file_save_path):  # pragma
         siw.save_project(fdir, fname)
         siw.quit_application()
 
-    @staticmethod
-    def execute_load_cfg_aedt(project_file, file_cfg_path, file_save_path):
+    def execute_load_cfg_aedt(self, project_file, file_cfg_path, file_save_path):
         fedb = Path(project_file).with_suffix(".aedb")
         edbapp = Edb(str(fedb), edbversion=version)
         edbapp.configuration.load(file_cfg_path)
         edbapp.configuration.run()
         edbapp.save_as(str(Path(file_save_path).with_suffix(".aedb")))
         edbapp.close()
-
-        h3d = Hfss3dLayout(str(Path(file_save_path).with_suffix(".aedb")))
-        h3d.save_project()
+        if not self.is_test:
+            h3d = Hfss3dLayout(str(Path(file_save_path).with_suffix(".aedb")))
+            h3d.save_project()
 
     @staticmethod
     def execute_export_cfg_siw(project_file, file_path_save):  # pragma: no cover
@@ -410,7 +410,7 @@ def execute_export_cfg_aedt(project_file, file_path_save):
 
 def main(is_test=False, execute=""):
     if is_test:
-        ConfigureEdbBackend(execute)
+        ConfigureEdbBackend(execute, is_test)
     else:  # pragma: no cover
 
         app = ConfigureEdbFrontend()

tests/system/visualization/test_45_workflows.py

@@ -199,6 +199,8 @@ def test_07_twinbuilder_convert_circuit(self, add_app):
 
         assert main({"is_test": True})
 
+        aedtapp.close_project()
+
     def test_08_configure_a3d(self, local_scratch):
         from ansys.aedt.core.workflows.project.configure_edb import main
 
@@ -449,7 +451,7 @@ def test_10_push_excitation_3dl(self, local_scratch, desktop):
         # assert h3d.design_datasets
         h3d.close_project(h3d.project_name)
 
-    def test_11_cutout(self, add_app, local_scratch):
+    def test_11_cutout(self, add_app):
         from ansys.aedt.core.workflows.hfss3dlayout.cutout import main
 
         app = add_app("ANSYS-HSD_V1", application=ansys.aedt.core.Hfss3dLayout, subfolder=test_subfolder)
@@ -466,7 +468,7 @@ def test_11_cutout(self, add_app, local_scratch):
         )
         app.close_project()
 
-    def test_12_export_layout(self, add_app, local_scratch):
+    def test_12_export_layout(self, add_app):
         from ansys.aedt.core.workflows.hfss3dlayout.export_layout import main
 
         app = add_app("ANSYS-HSD_V1", application=ansys.aedt.core.Hfss3dLayout, subfolder=test_subfolder)
@@ -590,7 +592,7 @@ def test_18_via_merging(self, local_scratch):
         from ansys.aedt.core.workflows.hfss3dlayout.via_clustering_extension import main
 
         file_path = os.path.join(local_scratch.path, "test_via_merging.aedb")
-        new_file = os.path.join(local_scratch.path, "__test_via_merging.aedb")
+        new_file = os.path.join(local_scratch.path, "new_test_via_merging.aedb")
         local_scratch.copyfolder(
             os.path.join(visualization_local_path, "example_models", "T45", "test_via_merging.aedb"), file_path
         )
@@ -754,7 +756,13 @@ def test_transformer_loss_distribution(self, add_app, local_scratch):
     def test_layout_design_toolkit_antipad_1(self, add_app, local_scratch):
         from ansys.aedt.core.workflows.hfss3dlayout.post_layout_design_toolkit import BackendAntipad
 
-        h3d = add_app("ANSYS-HSD_V1", application=ansys.aedt.core.Hfss3dLayout, subfolder=test_subfolder)
+        file_path = os.path.join(local_scratch.path, "ANSYS-HSD_V1_antipad_1.aedb")
+
+        local_scratch.copyfolder(
+            os.path.join(visualization_local_path, "example_models", "T45", "ANSYS-HSD_V1.aedb"), file_path
+        )
+
+        h3d = add_app(file_path, application=ansys.aedt.core.Hfss3dLayout, just_open=True)
         h3d.save_project()
         app_antipad = BackendAntipad(h3d)
         app_antipad.create(selections=["Via79", "Via78"], radius="1mm", race_track=True)
@@ -764,7 +772,14 @@ def test_layout_design_toolkit_antipad_1(self, add_app, local_scratch):
     def test_layout_design_toolkit_antipad_2(self, add_app, local_scratch):
         from ansys.aedt.core.workflows.hfss3dlayout.post_layout_design_toolkit import BackendAntipad
 
-        h3d = add_app("ANSYS-HSD_V1", application=ansys.aedt.core.Hfss3dLayout, subfolder=test_subfolder)
+        file_path = os.path.join(local_scratch.path, "ANSYS-HSD_V1_antipad_2.aedb")
+
+        local_scratch.copyfolder(
+            os.path.join(visualization_local_path, "example_models", "T45", "ANSYS-HSD_V1.aedb"), file_path
+        )
+
+        h3d = add_app(file_path, application=ansys.aedt.core.Hfss3dLayout, just_open=True)
+
         h3d.save_project()
 
         app_antipad = BackendAntipad(h3d)
@@ -775,7 +790,14 @@ def test_layout_design_toolkit_antipad_2(self, add_app, local_scratch):
     def test_layout_design_toolkit_micro_via(self, add_app, local_scratch):
         from ansys.aedt.core.workflows.hfss3dlayout.post_layout_design_toolkit import BackendMircoVia
 
-        h3d = add_app("ANSYS-HSD_V1", application=ansys.aedt.core.Hfss3dLayout, subfolder=test_subfolder)
+        file_path = os.path.join(local_scratch.path, "ANSYS-HSD_V1_antipad_3.aedb")
+
+        local_scratch.copyfolder(
+            os.path.join(visualization_local_path, "example_models", "T45", "ANSYS-HSD_V1.aedb"), file_path
+        )
+
+        h3d = add_app(file_path, application=ansys.aedt.core.Hfss3dLayout, just_open=True)
+
         h3d.save_project()
 
         app_microvia = BackendMircoVia(h3d)