From 477a1a1e99295f56b4807f2be5ea7e2ff32a43ec Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sun, 11 Aug 2024 09:57:50 -0400
Subject: [PATCH] Rebase into test case commit.

---
 lib/galaxy/tool_util/parameters/case.py       | 10 +++++
 test/functional/tools/section_24_2.xml        | 43 +++++++++++++++++++
 .../tool_util/test_parameter_test_cases.py    | 18 +++-----
 3 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 test/functional/tools/section_24_2.xml

diff --git a/lib/galaxy/tool_util/parameters/case.py b/lib/galaxy/tool_util/parameters/case.py
index 4d97bcd87489..5c79bbbb7974 100644
--- a/lib/galaxy/tool_util/parameters/case.py
+++ b/lib/galaxy/tool_util/parameters/case.py
@@ -28,6 +28,7 @@
     FloatParameterModel,
     IntegerParameterModel,
     RepeatParameterModel,
+    SectionParameterModel,
     ToolParameterT,
 )
 from .state import TestCaseToolState
@@ -235,6 +236,15 @@ def _merge_into_state(
                     repeat.parameters, inputs, repeat_state_array[i], profile, warnings, repeat_instance_prefix
                 )
             )
+    elif isinstance(tool_input, (SectionParameterModel,)):
+        section_state = state_at_level.get(input_name, {})
+        if input_name not in state_at_level:
+            state_at_level[input_name] = section_state
+
+        section = cast(SectionParameterModel, tool_input)
+        handled_inputs.update(
+            _merge_level_into_state(section.parameters, inputs, section_state, profile, warnings, state_path)
+        )
     else:
         test_input = _input_for(state_path, inputs)
         if test_input is not None:
diff --git a/test/functional/tools/section_24_2.xml b/test/functional/tools/section_24_2.xml
new file mode 100644
index 000000000000..ec62f0fd8ee9
--- /dev/null
+++ b/test/functional/tools/section_24_2.xml
@@ -0,0 +1,43 @@
+<tool id="section_24_2" name="section_24_2" version="1.0.0" profile="24.2">
+    <command><![CDATA[
+echo $int.inttest > '$out_file1' &&
+echo $float.floattest >> '$out_file1'
+    ]]></command>
+    <inputs>
+        <section name="int" title="Integer Section" expanded="true">
+            <param name="inttest" value="1" type="integer" />
+        </section>
+        <section name="float" title="Float Section" expanded="false">
+            <param name="floattest" value="1.0" type="float" />
+        </section>
+    </inputs>
+    <outputs>
+        <data name="out_file1" format="txt" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="int|inttest" value="12456" />
+            <param name="float|floattest" value="6.789" />
+            <output name="out_file1">
+                <assert_contents>
+                    <has_line line="12456" />
+                    <has_line line="6.789" />
+                </assert_contents>
+            </output>
+        </test>
+        <test>
+            <section name="int">
+                <param name="inttest" value="12456" />
+            </section>
+            <section name="float">
+                <param name="floattest" value="6.789" />
+            </section>
+            <output name="out_file1">
+                <assert_contents>
+                    <has_line line="12456" />
+                    <has_line line="6.789" />
+                </assert_contents>
+            </output>
+        </test>
+    </tests>
+</tool>
diff --git a/test/unit/tool_util/test_parameter_test_cases.py b/test/unit/tool_util/test_parameter_test_cases.py
index b435d1923243..640b20fc7dd0 100644
--- a/test/unit/tool_util/test_parameter_test_cases.py
+++ b/test/unit/tool_util/test_parameter_test_cases.py
@@ -1,4 +1,5 @@
 import os
+import re
 from typing import List
 
 from galaxy.tool_util.models import parse_tool
@@ -77,21 +78,14 @@ def _assert_tool_test_parsing_only_fails_with_newer_profile(tmp_path, filename:
     new_path = tmp_path / filename
     with open(original_path) as rf:
         tool_contents = rf.read()
-        import re
-
-        tool_contents = re.sub('profile=".*"', r"", tool_contents)
-        print(tool_contents)
+        tool_contents = re.sub(r'profile="[\d\.]*"', r"", tool_contents)
         new_profile_contents = tool_contents.replace("<tool ", '<tool profile="24.2" ', 1)
     with open(new_path, "w") as wf:
         wf.write(new_profile_contents)
-    parse_tool_test_descriptions(get_tool_source(original_path))
-    exception = None
-    try:
-        parse_tool_test_descriptions(get_tool_source(new_path))
-    except Exception as e:
-        print(e)
-        exception = e
-    assert exception, f"expected {filename} to have validation failure preventing loading of tools"
+    test_cases = parse_tool_test_descriptions(get_tool_source(original_path))
+    assert test_cases[0].to_dict()["error"] is False
+    test_cases = parse_tool_test_descriptions(get_tool_source(new_path))
+    assert test_cases[0].to_dict()["error"] is True, f"expected {filename} to have validation failure preventing loading of tools"
 
 
 def test_validate_framework_test_tools():