Fixing utils.printable_name after tuning it earlier.

pekkaklarck · pekkaklarck · commit 53dd38a2fd02 · 2016-03-01T23:35:51.000+02:00
Changes done in revision 233d9a4 broke other tests. Fixed that and added related unit tests for printable_name itself.
diff --git a/src/robot/utils/misc.py b/src/robot/utils/misc.py
@@ -69,7 +69,7 @@ def printable_name(string, code_style=False):
         return ''
     if code_style and len(parts) == 1 \
             and not (string.isalpha() and string.islower()):
-        parts = _camelCaseSplit(list(string))
+        parts = _camelCaseSplit(list(parts[0]))
     return ' '.join(part[0].upper() + part[1:] for part in parts)
 
 
@@ -89,10 +89,8 @@ def _camelCaseSplit(chars):
 def _isCamelCaseBoundary(prev, char, next):
     if prev.isdigit():
         return not char.isdigit()
-    if not prev.isalpha():
-        return False
     if char.isupper():
-        return not (prev.isupper() and (not next or next.isupper()))
+        return next.islower() or prev.isalpha() and not prev.isupper()
     if char.isdigit():
         return not prev.isdigit()
     return False
diff --git a/utest/utils/test_misc.py b/utest/utils/test_misc.py
@@ -70,6 +70,8 @@ def test_printable_name(self):
                          ('ALLCAPS', 'ALLCAPS'),
                          ('name with spaces', 'Name With Spaces'),
                          ('more   spaces', 'More Spaces'),
+                         ('  leading and trailing  ', 'Leading And Trailing'),
+                         ('  12number34  ', '12number34'),
                          ('Cases AND spaces', 'Cases AND Spaces'),
                          ('under_Score_name', 'Under_Score_name'),
                          ('camelCaseName', 'CamelCaseName'),
@@ -82,8 +84,12 @@ def test_printable_name(self):
     def test_printable_name_with_code_style(self):
         for inp, exp in [('simple', 'Simple'),
                          ('ALLCAPS', 'ALLCAPS'),
+                         ('name with spaces', 'Name With Spaces'),
+                         ('    more   spaces    ', 'More Spaces'),
                          ('under_score_name', 'Under Score Name'),
-                         ('under_score and spaces', 'Under Score And Spaces'),
+                         ('under__score and spaces', 'Under Score And Spaces'),
+                         ('__leading and trailing_ __', 'Leading And Trailing'),
+                         ('__12number34__', '12 Number 34'),
                          ('miXed_CAPS_nAMe', 'MiXed CAPS NAMe'),
                          ('with 89_numbers', 'With 89 Numbers'),
                          ('camelCaseName', 'Camel Case Name'),
@@ -93,6 +99,12 @@ def test_printable_name_with_code_style(self):
                          ('name42WithNumbers666', 'Name 42 With Numbers 666'),
                          ('name42WITHNumbers666', 'Name 42 WITH Numbers 666'),
                          ('12more34numbers', '12 More 34 Numbers'),
+                         ('2KW', '2 KW'),
+                         ('KW2', 'KW 2'),
+                         ('xKW', 'X KW'),
+                         ('KWx', 'K Wx'),
+                         (':KW', ':KW'),
+                         ('KW:', 'KW:'),
                          ('foo-bar', 'Foo-bar'),
                          ('Foo-b:a;r!', 'Foo-b:a;r!'),
                          ('Foo-B:A;R!', 'Foo-B:A;R!'),
