ColumnUDADuration: add "iso" style as synonym for "default"

For compatibility reasons I couldn't simply rename "default", so I just
added a new "iso" as a synonym. While I was in there I added some example
output.

There are currently no tests for UDA durations so I added one.

Author: apoelstra

src/columns/ColUDA.cpp

@@ -243,7 +243,8 @@ ColumnUDADuration::ColumnUDADuration() {
   _style = "default";
   _label = "";
   _uda = true;
-  _styles = {_style, "indicator"};
+  _styles = {_style, "indicator", "iso"};
+  _examples = {"P30D", "U", "P30D"};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -265,7 +266,7 @@ bool ColumnUDADuration::validate(const std::string& value) const {
 void ColumnUDADuration::measure(Task& task, unsigned int& minimum, unsigned int& maximum) {
   minimum = maximum = 0;
   if (task.has(_name)) {
-    if (_style == "default") {
+    if (_style == "default" || _style == "iso") {
       auto value = task.get(_name);
       if (value != "") minimum = maximum = Duration(value).formatISO().length();
     } else if (_style == "indicator") {
@@ -284,7 +285,7 @@ void ColumnUDADuration::measure(Task& task, unsigned int& minimum, unsigned int&
 void ColumnUDADuration::render(std::vector<std::string>& lines, Task& task, int width,
                                Color& color) {
   if (task.has(_name)) {
-    if (_style == "default") {
+    if (_style == "default" || _style == "iso") {
       auto value = task.get(_name);
       renderStringRight(lines, width, color, Duration(value).formatISO());
     } else if (_style == "indicator") {

test/columns.test.py

@@ -543,6 +543,46 @@ def test_uda_uuid_short(self):
         self.assertEqual(self.expected_str[:8], out.strip())
 
 
+class TestUDADurationFormats(TestCase):
+    @classmethod
+    def setUpClass(cls):
+        """Executed once before any test in the class"""
+        cls.t = Task()
+        cls.t.config("verbose", "nothing")
+        cls.t.config("uda.uda_duration.label", "uda_duration")
+        cls.t.config("uda.uda_duration.type", "duration")
+        cls.t.config("report.xxx.columns", "id,uda_duration")
+
+        # Test only nonnegative durations, since negative ones are not handled
+        # well. See https://github.com/GothenburgBitFactory/libshared/pull/110
+        cls.t("add one uda_duration:0min")
+        cls.t("add two uda_duration:1min")
+        cls.t("add thr uda_duration:60d")
+        cls.t("add four uda_duration:'30d + 10h + 3min + 2s'")
+
+    def test_uda_duration_format_indicator(self):
+        """Verify uda_duration.indicator formatting"""
+        code, out, err = self.t(f"xxx rc.report.xxx.columns:id,uda_duration.indicator")
+        # The indicator for UDAs is always U.
+        self.assertRegex(out, r"1\s+U")
+        self.assertRegex(out, r"2\s+U")
+        self.assertRegex(out, r"3\s+U")
+        self.assertRegex(out, r"4\s+U")
+
+    def test_uda_duration_format_iso(self):
+        """Verify uda_duration.iso formatting"""
+        for style in ["iso", "default"]:
+            code, out, err = self.t(
+                f"xxx rc.report.xxx.columns:id,uda_duration.{style}"
+            )
+            # The ISO format shouldn't change at all, so do exact matches rather than
+            # more flexible regexes.
+            self.assertRegex(out, r"1\s+PT0S")
+            self.assertRegex(out, r"2\s+PT1M")
+            self.assertRegex(out, r"3\s+P60D")
+            self.assertRegex(out, r"4\s+P30DT10H3M2S")
+
+
 class TestFeature1061(TestCase):
     def setUp(self):
         """Executed before each test in the class"""