From 8a81593c5372d1e2b6031e6ae62a820f4ef6857c Mon Sep 17 00:00:00 2001
From: Leonid Kostrykin <void@evoid.de>
Date: Wed, 13 Mar 2024 09:34:34 +0000
Subject: [PATCH] Rename `has_image_labels` to `has_image_n_labels`

---
 lib/galaxy/tool_util/verify/asserts/image.py | 2 +-
 lib/galaxy/tool_util/xsd/galaxy.xsd          | 8 ++++----
 test/functional/tools/validation_image.xml   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/galaxy/tool_util/verify/asserts/image.py b/lib/galaxy/tool_util/verify/asserts/image.py
index 3ebd46095f9..bac607cf3d1 100644
--- a/lib/galaxy/tool_util/verify/asserts/image.py
+++ b/lib/galaxy/tool_util/verify/asserts/image.py
@@ -238,7 +238,7 @@ def _get_image_labels(
     return im_arr, present_labels
 
 
-def assert_has_image_labels(
+def assert_has_image_n_labels(
     output_bytes: bytes,
     channel: Optional[Union[int, str]] = None,
     exclude_labels: Optional[Union[str, List[int]]] = None,
diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd
index f9d13253511..771d584b030 100644
--- a/lib/galaxy/tool_util/xsd/galaxy.xsd
+++ b/lib/galaxy/tool_util/xsd/galaxy.xsd
@@ -2253,7 +2253,7 @@ module.
       <xs:element name="has_image_channels" type="AssertHasImageChannels" />
       <xs:element name="has_image_mean_intensity" type="AssertHasImageMeanIntensity" />
       <xs:element name="has_image_center_of_mass" type="AssertHasImageCenterOfMass" />
-      <xs:element name="has_image_labels" type="AssertHasImageLabels" />
+      <xs:element name="has_image_n_labels" type="AssertHasImageNLabels" />
       <xs:element name="has_image_mean_object_size" type="AssertHasImageMeanObjectSize" />
     </xs:choice>
   </xs:group>
@@ -2918,18 +2918,18 @@ $attribute_list::5
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
-  <xs:complexType name="AssertHasImageLabels">
+  <xs:complexType name="AssertHasImageNLabels">
     <xs:annotation>
       <xs:documentation xml:lang="en"><![CDATA[
 Asserts the output is an image and has the specified number of labels, or unique values (e.g.,
-``<has_image_labels value="187" exclude_labels="0" />``).
+``<has_image_n_labels n="187" exclude_labels="0" />``).
 The primary usage of this assertion is to verify the number of objects in images with uniquely labeled objects.
 
 $attribute_list::5
 ]]>
       </xs:documentation>
     </xs:annotation>
-    <xs:attribute name="value" type="xs:integer" use="optional">
+    <xs:attribute name="n" type="xs:integer" use="optional">
       <xs:annotation>
         <xs:documentation xml:lang="en">Expected number of labels.`</xs:documentation>
       </xs:annotation>
diff --git a/test/functional/tools/validation_image.xml b/test/functional/tools/validation_image.xml
index dd79503a357..852e78191a1 100644
--- a/test/functional/tools/validation_image.xml
+++ b/test/functional/tools/validation_image.xml
@@ -101,7 +101,7 @@
                     <has_image_width width="32" />
                     <has_image_height height="32" />
                     <has_image_channels channels="1" />
-                    <has_image_labels value="1" exclude_labels="0" />
+                    <has_image_n_labels n="1" exclude_labels="0" />
                     <has_image_mean_object_size mean_object_size="256" exclude_labels="0" />
                 </assert_contents>
             </output>
@@ -113,7 +113,7 @@
                     <has_image_width width="32" />
                     <has_image_height height="32" />
                     <has_image_channels channels="1" />
-                    <has_image_labels value="2" />
+                    <has_image_n_labels n="2" />
                     <has_image_mean_object_size mean_object_size="512" />
                 </assert_contents>
             </output>
@@ -149,7 +149,7 @@
                     <has_image_width width="32" />
                     <has_image_height height="32" />
                     <has_image_channels channels="1" />
-                    <has_image_labels value="2" />
+                    <has_image_n_labels n="2" />
                     <has_image_mean_object_size mean_object_size="511" eps="1.0" />
                 </assert_contents>
             </output>