Merge pull request #9052 from nsoranzo/release_19.05_followup_on_9047

[19.05] Restore casting a boolean param to str when comparing with one

lib/galaxy/tools/wrappers.py

@@ -89,6 +89,8 @@ def _get_cast_value(self):
         return cast.get(self.input.type, str)(self)
 
     def __eq__(self, other):
+        if self.input.type == 'boolean' and isinstance(other, string_types):
+            return str(self) == other
         return self._get_cast_value() == other
 
     def __ne__(self, other):
@@ -112,6 +114,8 @@ def __getattr__(self, key):
         return getattr(self.value, key)
 
     def __gt__(self, other):
+        if self.input.type == 'boolean' and isinstance(other, string_types):
+            return str(self) > other
         return self._get_cast_value() > other
 
     def __int__(self):

test/unit/tools/test_wrappers.py

@@ -5,6 +5,7 @@
 from galaxy.datatypes.metadata import MetadataSpecCollection
 from galaxy.jobs.datasets import DatasetPath
 from galaxy.tools.parameters.basic import (
+    BooleanToolParameter,
     DrillDownSelectToolParameter,
     FloatToolParameter,
     IntegerToolParameter,
@@ -89,10 +90,12 @@ def valuewrapper(tool, value, paramtype):
     if paramtype == "integer":
         parameter = IntegerToolParameter(tool, XML('<param name="blah" type="integer" value="10" min="0" />'))
     elif paramtype == "text":
-        parameter = TextToolParameter(tool, XML('<param name="blah" type="text" value="10"/>'))
+        parameter = TextToolParameter(tool, XML('<param name="blah" type="text" value="foo"/>'))
     elif paramtype == "float":
-        parameter = FloatToolParameter(tool, XML('<param name="bla" type="float" value="10"/>'))
-    return InputValueWrapper(parameter, str(value))
+        parameter = FloatToolParameter(tool, XML('<param name="blah" type="float" value="10.0"/>'))
+    elif paramtype == "boolean":
+        parameter = BooleanToolParameter(tool, XML('<param name="blah" type="boolean" truevalue="truevalue" falsevalue="falsevalue"/>'))
+    return InputValueWrapper(parameter, value)
 
 
 @with_mock_tool
@@ -106,6 +109,14 @@ def test_input_value_wrapper_comparison(tool):
     assert wrapper > 2
     assert wrapper < 10
     assert wrapper < 5.1
+    wrapper = valuewrapper(tool, True, "boolean")
+    assert bool(wrapper) is True, wrapper
+    assert str(wrapper) == "truevalue"
+    assert wrapper == "truevalue"
+    wrapper = valuewrapper(tool, False, "boolean")
+    assert bool(wrapper) is False, wrapper
+    assert str(wrapper) == "falsevalue"
+    assert wrapper == "falsevalue"
 
 
 @with_mock_tool