From 9d6c7eb0e86efd47d00064822c0216fb474ef008 Mon Sep 17 00:00:00 2001
From: Bernard Knueven <Bernard.Knueven@nrel.gov>
Date: Tue, 22 Oct 2024 12:52:24 -0600
Subject: [PATCH] move get_solver test to more natural location

---
 ...est_solvers.py => test_solver_wrappers.py} |  5 -----
 watertap/core/tests/test_solvers.py           | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 rename watertap/core/plugins/tests/{test_solvers.py => test_solver_wrappers.py} (98%)
 create mode 100644 watertap/core/tests/test_solvers.py

diff --git a/watertap/core/plugins/tests/test_solvers.py b/watertap/core/plugins/tests/test_solver_wrappers.py
similarity index 98%
rename from watertap/core/plugins/tests/test_solvers.py
rename to watertap/core/plugins/tests/test_solver_wrappers.py
index abcb5588dd..2c1cffbf0b 100644
--- a/watertap/core/plugins/tests/test_solvers.py
+++ b/watertap/core/plugins/tests/test_solver_wrappers.py
@@ -20,7 +20,6 @@
     constraints_with_scale_factor_generator,
 )
 from idaes.core.util.model_statistics import number_activated_objectives
-from watertap.core.solvers import get_solver
 from watertap.core.plugins.solvers import IpoptWaterTAP, _pyomo_nl_writer_log
 
 import watertap.core.plugins.solvers as solver_module
@@ -66,10 +65,6 @@ def s(self):
     def test_pyomo_registration(self, s):
         assert s.__class__ is IpoptWaterTAP
 
-    @pytest.mark.unit
-    def test_idaes_registration(self):
-        assert get_solver().__class__ is IpoptWaterTAP
-
     @pytest.mark.unit
     @pytest.mark.requires_idaes_solver
     def test_attribute_passthrough(self, s):
diff --git a/watertap/core/tests/test_solvers.py b/watertap/core/tests/test_solvers.py
new file mode 100644
index 0000000000..c5c6cafb38
--- /dev/null
+++ b/watertap/core/tests/test_solvers.py
@@ -0,0 +1,21 @@
+#################################################################################
+# WaterTAP Copyright (c) 2020-2024, The Regents of the University of California,
+# through Lawrence Berkeley National Laboratory, Oak Ridge National Laboratory,
+# National Renewable Energy Laboratory, and National Energy Technology
+# Laboratory (subject to receipt of any required approvals from the U.S. Dept.
+# of Energy). All rights reserved.
+#
+# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and license
+# information, respectively. These files are also available online at the URL
+# "https://github.com/watertap-org/watertap/"
+#################################################################################
+
+
+import pytest
+
+from watertap.core.solvers import get_solver
+from watertap.core.plugins.solvers import IpoptWaterTAP
+
+
+def test_get_solver():
+    assert get_solver().__class__ is IpoptWaterTAP