Explicit tests for Should Match bug with newlines.

pekkaklarck · pekkaklarck · commit 41f09efb6aba · 2018-07-06T16:39:39.000+03:00
Bug itself is already fixed as a side-effect of PR robotframework#2560. Fixes robotframework#2894.
diff --git a/atest/robot/standard_libraries/builtin/should_match.robot b/atest/robot/standard_libraries/builtin/should_match.robot
@@ -6,6 +6,9 @@ Resource          builtin_resource.robot
 Should Match
     Check test case    ${TESTNAME}
 
+Should Match with extra trailing newline
+    Check test case    ${TESTNAME}
+
 Should Match case-insensitive
     Check test case    ${TESTNAME}
 
diff --git a/atest/testdata/standard_libraries/builtin/should_match.robot b/atest/testdata/standard_libraries/builtin/should_match.robot
@@ -8,8 +8,14 @@ Should Match
     abcdefghijklmnopqrstuvwxyz    *
     abcdefghijklmnopqrstuvwxyz    ?*?efg*p*t?vw*z
     NOK                           ???
+    foo\n                         foo\n
     NOK                           H*K    Failure
 
+Should Match with extra trailing newline
+    [Template]    Run Keyword And Expect Error
+    'foo\n' does not match 'foo'    Should Match    foo\n    foo
+    'foo' does not match 'foo\n'    Should Match    foo      foo\n
+
 Should Match case-insensitive
     [Template]    Should Match
     Hello!    heLLo!    ignore_case=True
@@ -26,6 +32,8 @@ Should Not Match
     [Template]    Should Not Match
     this string does not    match this pattern
     Case matters            case matters
+    foo\n                   foo
+    foo                     foo\n
     Hello world             ?ello*
 
 Should Not Match case-insensitive
diff --git a/utest/utils/test_match.py b/utest/utils/test_match.py
@@ -121,6 +121,15 @@ def test_glob_pattern_with_brackets_not_in_range(self):
         pattern = 'Weird*[[!name]]'
         self._matches('Weird my[game]', pattern)
 
+    def test_spaceless(self):
+        for text in ['fbar', 'foobar']:
+            assert Matcher('f*bar').match(text)
+            assert Matcher('f * b a r').match(text)
+            assert Matcher('f*bar', spaceless=False).match(text)
+        for text in ['f b a r', 'f o o b a r', '   foo bar   ', 'fbar\n']:
+            assert Matcher('f*bar').match(text)
+            assert not Matcher('f*bar', spaceless=False).match(text)
+
     def _matches(self, string, pattern, **config):
         assert Matcher(pattern, **config).match(string), pattern
 
