Merge pull request #1681 from east1k/main

Fix issue #1680

Author: CharliePoole

src/NUnitEngine/nunit.engine.tests/Services/TestSelectionParserTests.cs

@@ -87,6 +87,16 @@ public void TestParser_InvalidInput(string input, Type type)
             new TestCaseData("test=My.Test.Fixture.Method(\"<xyz>\")", "<test>My.Test.Fixture.Method(&quot;&lt;xyz&gt;&quot;)</test>"),
             new TestCaseData("test==Issue1510.TestSomething ( Option1 , \"ABC\" ) ", "<test>Issue1510.TestSomething(Option1,&quot;ABC&quot;)</test>"),
             new TestCaseData("test==Issue1510.TestSomething ( Option1 , \"A B C\" ) ", "<test>Issue1510.TestSomething(Option1,&quot;A B C&quot;)</test>"),
+            new TestCaseData("test == namespace.class(1).test1(1)", "<test>namespace.class(1).test1(1)</test>"),
+            new TestCaseData("test == \"namespace.class(1).test1(1)\"", "<test>namespace.class(1).test1(1)</test>"),
+            new TestCaseData("test == 'namespace.class(1).test1(1)'", "<test>namespace.class(1).test1(1)</test>"),
+            new TestCaseData("test =~ \"(namespace\\.test1\\(1\\)|namespace\\.test2\\(2\\))\"", "<test re='1'>(namespace.test1(1)|namespace.test2(2))</test>"),
+            new TestCaseData("test =~ '(namespace\\.test1\\(1\\)|namespace\\.test2\\(2\\))'", "<test re='1'>(namespace.test1(1)|namespace.test2(2))</test>"),
+            new TestCaseData("test =~ /(namespace\\.test1\\(1\\)|namespace\\.test2\\(2\\))/", "<test re='1'>(namespace.test1(1)|namespace.test2(2))</test>"),
+            new TestCaseData("test =~ \"(namespace1|namespace2)\\.test1\"", "<test re='1'>(namespace1|namespace2).test1</test>"),
+            new TestCaseData("test =~ '(namespace1|namespace2)\\.test1'", "<test re='1'>(namespace1|namespace2).test1</test>"),
+            new TestCaseData("test =~ /(namespace1|namespace2)\\.test1/", "<test re='1'>(namespace1|namespace2).test1</test>"),
+            new TestCaseData("test='My.Test.Fixture.Method(\" A \\\\\" B \\\\\" C \")'", "<test>My.Test.Fixture.Method(&quot; A \\&quot; B \\&quot; C &quot;)</test>"),
             // And Filter
             new TestCaseData("cat==Urgent && test=='My.Tests'", "<and><cat>Urgent</cat><test>My.Tests</test></and>"),
             new TestCaseData("cat==Urgent and test=='My.Tests'", "<and><cat>Urgent</cat><test>My.Tests</test></and>"),

src/NUnitEngine/nunit.engine/Services/TestSelectionParser.cs

@@ -125,7 +125,9 @@ public string ParseFilterElement()
             {
                 case "test":
                     op = Expect(REL_OPS);
-                    rhs = GetTestName();
+                    rhs = op == MATCH_OP || op == NOMATCH_OP
+                        ? Expect(TokenKind.String, TokenKind.Word)
+                        : GetTestName();
                     return EmitFilterElement(lhs, op, rhs);
 
                 case "cat":
@@ -163,35 +165,15 @@ private Token GetTestName()
 
             if (result.Kind == TokenKind.String)
             {
-                int index = result.Text.IndexOf('(');
-
-                if (index < 0)
-                    return result;
-
-                // Remove white space around arguments
-                string testName = result.Text;
-                sb = new StringBuilder(testName.Substring(0, index).Trim());
-                sb.Append('(');
-                bool done = false;
-
-                while (++index < testName.Length && !done)
+                var inQuotes = false;
+                var inEscape = false;
+                foreach (var ch in result.Text)
                 {
-                    char ch = testName[index];
-                    switch (ch)
-                    {
-                        case '"':
-                            sb.Append(ch);
-                            while (++index < testName.Length && testName[index] != '"')
-                                sb.Append(testName[index]);
-                            sb.Append('"');
-                            break;
-                        case ' ':
-                            break;
-                        default:
-                            sb.Append(ch);
-                            done = ch == ')';
-                            break;
-                    }
+                    if (ch == ' ' && !inQuotes)
+                        continue;
+                    sb.Append(ch);
+                    inQuotes = (!inQuotes && ch == '"') || (inQuotes && ch != '"') || (inQuotes  && ch == '"' && inEscape);
+                    inEscape = inQuotes && !inEscape && ch == '\\';
                 }
             }
             else