Address feedback and add more tests

equinor · Sep 27, 2024 · f29e219 · f29e219
1 parent f4e99f8
commit f29e219
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/src/ert/config/analysis_config.py b/src/ert/config/analysis_config.py
@@ -36,8 +36,8 @@ class UpdateSettings:
 @dataclass
 class DesignMatrixArgs:
     xls_filename: Path
-    designsheet: str
-    defaultsheet: str
+    design_sheet: str
+    default_sheet: str
 
     @classmethod
     def from_config_list(cls, config_list: List[str]) -> "DesignMatrixArgs":
@@ -69,8 +69,8 @@ def from_config_list(cls, config_list: List[str]) -> "DesignMatrixArgs":
         assert default_sheet is not None
         return cls(
             xls_filename=filename,
-            designsheet=design_sheet,
-            defaultsheet=default_sheet,
+            design_sheet=design_sheet,
+            default_sheet=default_sheet,
         )
 
 

diff --git a/tests/ert/unit_tests/config/test_analysis_config.py b/tests/ert/unit_tests/config/test_analysis_config.py
@@ -103,6 +103,32 @@ def test_invalid_design_matrix_format_raises_validation_error():
         )
 
 
+def test_design_matrix_without_design_sheet_raises_validation_error():
+    with pytest.raises(ConfigValidationError, match="Missing required DESIGN_SHEET"):
+        _ = AnalysisConfig.from_dict(
+            {
+                ConfigKeys.DESIGN_MATRIX: [
+                    "my_sheet.xlsx",
+                    "DESIGN_:this_is_wrong",
+                    "DEFAULT_SHEET:my_default",
+                ],
+            }
+        )
+
+
+def test_design_matrix_without_default_sheet_raises_validation_error():
+    with pytest.raises(ConfigValidationError, match="Missing required DEFAULT_SHEET"):
+        _ = AnalysisConfig.from_dict(
+            {
+                ConfigKeys.DESIGN_MATRIX: [
+                    "my_sheet.xlsx",
+                    "DESIGN_SHEET:my_design",
+                    "DEFAULT_:this_is_wrong",
+                ],
+            }
+        )
+
+
 def test_invalid_min_realization_percentage_raises_config_validation_error():
     with pytest.raises(
         ConfigValidationError,