TW-74176 Update to TeamCity 2021.2.1 changed test count - supports type args and too long args

Author: NikolayPianikov

TeamCity.VSTest.TestLogger.Tests/TestNameProviderTests.cs

@@ -16,10 +16,21 @@ public class TestNameProviderTests
 
         // XUnit
         [InlineData("XUnit.Tests.Test1", "XUnit.Tests.Test1", "XUnit.Tests.Test1")]
+        // XUnit with type args
+        [InlineData("XUnit.Tests.Test1", "XUnit.Tests.Test1<int>", "XUnit.Tests.Test1<int>")]
         // XUnit [Fact(DisplayName = "Abc")]
         [InlineData("XUnit.Tests.Test1", "Abc", "XUnit.Tests.Test1")]
+        // XUnit [Fact(DisplayName = "Abc")] with type args
+        [InlineData("XUnit.Tests.Test1", "Abc<int, String>", "XUnit.Tests.Test1<int, String>")]
         // XUnit with parameters
         [InlineData("XUnit.Tests.Test2", "XUnit.Tests.Test2 (str1: \"Aaa\", str2: \"Bb\")", "XUnit.Tests.Test2(str1: \"Aaa\", str2: \"Bb\")")]
+        [InlineData("XUnit.Tests.Test2", "XUnit.Tests.Test2(str1: \"Aaa<string, Int>\", str2: \"Bb...", "XUnit.Tests.Test2(str1: \"Aaa<string, Int>\", str2: \"Bb...)")]
+        // XUnit with parameters with type args
+        [InlineData("XUnit.Tests.Test2", "XUnit.Tests.Test2<int, String>(str1: \"Aaa\", str2: \"Bb\")", "XUnit.Tests.Test2<int, String>(str1: \"Aaa\", str2: \"Bb\")")]
+        // XUnit with long parameters
+        [InlineData("XUnit.Tests.Test2", "XUnit.Tests.Test2 (str1: \"Aaa\", str2: \"Bb...", "XUnit.Tests.Test2(str1: \"Aaa\", str2: \"Bb...)")]
+        // XUnit with long parameters with type args
+        [InlineData("XUnit.Tests.Test2", "XUnit.Tests.Test2<string, Int>(str1: \"Aaa\", str2: \"Bb...", "XUnit.Tests.Test2<string, Int>(str1: \"Aaa\", str2: \"Bb...)")]
         // [Theory(DisplayName = "Abc")]
         [InlineData("XUnit.Tests.Test2", "Abc (str1: \"Aaa\", str2: \"Bb\")", "XUnit.Tests.Test2(str1: \"Aaa\", str2: \"Bb\")")]
         [InlineData("XUnit.Tests.Test2", "Abc (str1: \"Aaa\", str2: \"Bb\")  ", "XUnit.Tests.Test2(str1: \"Aaa\", str2: \"Bb\")")]
@@ -34,7 +45,7 @@ public class TestNameProviderTests
         [InlineData("MSTest.Tests.Test2", "Test2 (Aa,Bb)", "MSTest.Tests.Test2(Aa,Bb)")]
         [InlineData("MSTest.Tests.Test2", "Test2 ()", "MSTest.Tests.Test2()")]
         [InlineData("MSTest.Tests.Test2", "Test3 (Aa,Bb)", "MSTest.Tests.Test2(Aa,Bb)")]
-        [InlineData("MSTest.Tests.Test2", "Test2 (Aa,", "MSTest.Tests.Test2")]
+        [InlineData("MSTest.Tests.Test2", "Test2 (Aa,", "MSTest.Tests.Test2(Aa,)")]
         [InlineData("A.Test2", "Test2 (Aa,Bb)", "A.Test2(Aa,Bb)")]
         [InlineData("A...Test2.", "Test2 (Aa,Bb)", "A...Test2.(Aa,Bb)")]
 
@@ -45,7 +56,7 @@ public class TestNameProviderTests
         [InlineData("", "Abc", "Abc")]
         [InlineData("        ", "Abc", "Abc")]
         [InlineData(null, null, "")]
-        public void Should(string fullyQualifiedName, string displayName, string expected)
+        public void ShouldProvideName(string fullyQualifiedName, string displayName, string expected)
         {
             // Given
             var nameFactory = CreateInstance();

TeamCity.VSTest.TestLogger/TestNameProvider.cs

@@ -32,18 +32,27 @@ public string GetTestName(string fullyQualifiedName, string displayName)
 
         private static string GetArgs(string name)
         {
-            if (!name.TrimEnd().EndsWith(")"))
+            var typedArgsPosition = name.IndexOf("<", StringComparison.Ordinal);
+            var hasTypes = typedArgsPosition >= 0;
+            var argsPosition = name.IndexOf("(", StringComparison.Ordinal);
+            var hasArgs = argsPosition >= 0;
+            if (!hasArgs && !hasTypes)
             {
                 return string.Empty;
             }
 
-            var argsPosition = name.IndexOf("(", StringComparison.Ordinal);
-            if (argsPosition < 0)
+            if (!hasArgs || hasTypes && typedArgsPosition < argsPosition)
             {
-                return string.Empty;
+                argsPosition = typedArgsPosition;
             }
 
-            return name.Substring(argsPosition, name.Length - argsPosition);
+            name = name.Substring(argsPosition, name.Length - argsPosition).Trim();
+            if (hasArgs && !name.EndsWith(")"))
+            {
+                name += ")";
+            }
+            
+            return name;
         }
     }
 }