test_validate: Fix tests, reformat

Now has two arguments, passing possible options first.

Author: bendudson

hypnotoad/test_suite/test_validate.py

@@ -1,9 +1,17 @@
 from hypnotoad.agent import tools
+from hypnotoad.cases import tokamak
+from hypnotoad.core.mesh import BoutMesh
+
+POSSIBLE_OPTIONS = (
+    tokamak.TokamakEquilibrium.user_options_factory.defaults
+    | tokamak.TokamakEquilibrium.nonorthogonal_options_factory.defaults
+    | BoutMesh.user_options_factory.defaults
+)
 
 
 def test_validate_unknown_key():
     # Using an invalid key should lead to an issue and suggestion
-    assert tools.validate_settings({"nxcore": 10}) == {
+    assert tools.validate_settings(POSSIBLE_OPTIONS, {"nxcore": 10}) == {
         "valid": False,
         "issues": {
             "nxcore": {
@@ -17,7 +25,7 @@ def test_validate_unknown_key():
 
 def test_validate_wrong_type():
     # Using the wrong type
-    assert tools.validate_settings({"nx_core": 3.4}) == {
+    assert tools.validate_settings(POSSIBLE_OPTIONS, {"nx_core": 3.4}) == {
         "valid": False,
         "issues": {
             "nx_core": {
@@ -31,7 +39,9 @@ def test_validate_wrong_type():
 
 
 def test_validate_invalid_value():
-    assert tools.validate_settings({"curvature_type": "nonsense"}) == {
+    assert tools.validate_settings(
+        POSSIBLE_OPTIONS, {"curvature_type": "nonsense"}
+    ) == {
         "valid": False,
         "issues": {
             "curvature_type": {
@@ -45,7 +55,7 @@ def test_validate_invalid_value():
 
 
 def test_validate_out_of_bounds():
-    assert tools.validate_settings({"refine_width": -1.0}) == {
+    assert tools.validate_settings(POSSIBLE_OPTIONS, {"refine_width": -1.0}) == {
         "valid": False,
         "issues": {
             "refine_width": {