Simplify model-specific construction tests

Author: bernalde

tests/test_basic.py

@@ -68,7 +68,7 @@ def test_basic_model_construction(self):
         except (ImportError, AttributeError):
             pytest.skip("biofuel module or build_model not available")
         except Exception as e:
-            pytest.skip(f"Model construction failed: {e}")
+            pytest.fail(f"Model construction raised unexpected error: {e}")
 
 
 # (Line intentionally left blank for clarity and to maintain spacing.)

tests/test_model_structure.py

@@ -142,7 +142,9 @@ def test_models_return_pyomo_objects(self):
                         ), f"{module_name} model has no components"
 
                     except Exception as e:
-                        pytest.skip(f"{module_name} model construction failed: {e}")
+                        pytest.fail(
+                            f"{module_name} model construction raised unexpected error: {e}"
+                        )
             except ImportError:
                 pytest.skip(f"Module {module_name} not available")
 

tests/test_module_imports.py

@@ -86,50 +86,48 @@ def test_build_model_callable(self, module_name):
                             f"{module_name}.build_model requires specific arguments"
                         )
                 except Exception as e:
-                    pytest.skip(f"{module_name}.build_model failed with error: {e}")
+                    err_msg = str(e)
+                    if (
+                        "No executable found for solver" in err_msg
+                        or "No 'gams' command" in err_msg
+                    ):
+                        pytest.skip(
+                            f"{module_name}.build_model requires external solver: {e}"
+                        )
+                    else:
+                        pytest.fail(
+                            f"{module_name}.build_model raised unexpected error: {e}"
+                        )
         except ImportError:
             pytest.skip(f"Module {module_name} not available")
 
 
 class TestModelConstruction:
     """Test model construction for key modules."""
 
-    def test_cstr_model_construction(self):
-        """Test CSTR model construction specifically."""
-        try:
-            import gdplib.cstr
-
-            model = gdplib.cstr.build_model()
-            assert model is not None
-            # Basic model validation
-            assert hasattr(model, "component_objects")
-        except ImportError:
-            pytest.skip("CSTR module not available")
-        except Exception as e:
-            pytest.skip(f"CSTR model construction failed: {e}")
+    MODELS = ["cstr", "biofuel", "gdp_col"]
 
-    def test_biofuel_model_construction(self):
-        """Test biofuel model construction specifically."""
+    @pytest.mark.parametrize("module_name", MODELS)
+    def test_model_construction(self, module_name):
+        """Ensure that selected models can be built successfully."""
         try:
-            import gdplib.biofuel
-
-            model = gdplib.biofuel.build_model()
-            assert model is not None
-            assert hasattr(model, "component_objects")
-        except ImportError:
-            pytest.skip("Biofuel module not available")
-        except Exception as e:
-            pytest.skip(f"Biofuel model construction failed: {e}")
-
-    def test_gdp_col_model_construction(self):
-        """Test GDP column model construction specifically."""
-        try:
-            import gdplib.gdp_col
+            module = importlib.import_module(f"gdplib.{module_name}")
 
-            model = gdplib.gdp_col.build_model()
+            model = module.build_model()
             assert model is not None
             assert hasattr(model, "component_objects")
         except ImportError:
-            pytest.skip("GDP column module not available")
+            pytest.skip(f"{module_name} module not available")
         except Exception as e:
-            pytest.skip(f"GDP column model construction failed: {e}")
+            err_msg = str(e)
+            if (
+                "No executable found for solver" in err_msg
+                or "No 'gams' command" in err_msg
+            ):
+                pytest.skip(
+                    f"{module_name} model construction requires external solver: {e}"
+                )
+            else:
+                pytest.fail(
+                    f"{module_name} model construction raised unexpected error: {e}"
+                )

tests/test_pip_installation.py

@@ -122,4 +122,4 @@ def test_pip_install_scenario(self):
             else:
                 pytest.fail(f"Import failed: {e}")
         except Exception as e:
-            pytest.skip(f"Model construction failed (may require solver): {e}")
+            pytest.fail(f"Model construction raised unexpected error: {e}")