Fixing tests

Author: parthopdas

src/RustAnalyzer.TestAdapter.UnitTests/Cargo/ToolChainServiceTests.GetTestSuiteTestsAsync.hello_library.approved.txt

@@ -9,11 +9,11 @@
       "TestExecutionEnvironment": "",
       "Profile": "release",
       "TestExes": [
-        "<TestRoot>\\hello_library\\target\\release\\deps\\hello_lib-d9d78f0fcd1af879.exe",
-        "<TestRoot>\\hello_library\\target\\release\\deps\\int_tests-58f9d629627e8abd.exe"
+        "<TestRoot>\\hello_library\\target\\release\\deps\\hello_lib-*.exe",
+        "<TestRoot>\\hello_library\\target\\release\\deps\\int_tests-*.exe"
       ]
     },
-    "exe": "<TestRoot>\\hello_library\\target\\release\\deps\\hello_lib-d9d78f0fcd1af879.exe",
+    "exe": "<TestRoot>\\hello_library\\target\\release\\deps\\hello_lib-*.exe",
     "tests": [
       {
         "type": "test",
@@ -159,11 +159,11 @@
       "TestExecutionEnvironment": "",
       "Profile": "release",
       "TestExes": [
-        "<TestRoot>\\hello_library\\target\\release\\deps\\hello_lib-d9d78f0fcd1af879.exe",
-        "<TestRoot>\\hello_library\\target\\release\\deps\\int_tests-58f9d629627e8abd.exe"
+        "<TestRoot>\\hello_library\\target\\release\\deps\\hello_lib-*.exe",
+        "<TestRoot>\\hello_library\\target\\release\\deps\\int_tests-*.exe"
       ]
     },
-    "exe": "<TestRoot>\\hello_library\\target\\release\\deps\\int_tests-58f9d629627e8abd.exe",
+    "exe": "<TestRoot>\\hello_library\\target\\release\\deps\\int_tests-*.exe",
     "tests": [
       {
         "type": "test",

src/RustAnalyzer.TestAdapter.UnitTests/Cargo/ToolChainServiceTests.GetTestSuiteTestsAsync.hello_world.approved.txt

@@ -9,10 +9,10 @@
       "TestExecutionEnvironment": "",
       "Profile": "release",
       "TestExes": [
-        "<TestRoot>\\hello_world\\target\\release\\deps\\hello_world-d116900458eb29b6.exe"
+        "<TestRoot>\\hello_world\\target\\release\\deps\\hello_world-*.exe"
       ]
     },
-    "exe": "<TestRoot>\\hello_world\\target\\release\\deps\\hello_world-d116900458eb29b6.exe",
+    "exe": "<TestRoot>\\hello_world\\target\\release\\deps\\hello_world-*.exe",
     "tests": []
   }
 ]

src/RustAnalyzer.TestAdapter.UnitTests/Cargo/ToolChainServiceTests.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using ApprovalTests;
 using ApprovalTests.Namers;
@@ -10,6 +11,7 @@
 using KS.RustAnalyzer.Tests.Common;
 using Newtonsoft.Json;
 using Xunit;
+using static ApprovalTests.Scrubber.PdfScrubber;
 
 namespace KS.RustAnalyzer.TestAdapter.UnitTests.Cargo;
 
@@ -113,8 +115,8 @@ public async Task AdditionalBuildArgsTestsAsync(string workspaceRelRoot, string
     }
 
     [Theory]
-    [InlineData(@"hello_world", "hello_world_hello_world.rusttests", "release", new string[] { "hello_world-d116900458eb29b6.exe" })] // No tests.
-    [InlineData(@"hello_library", "hello_lib_libhello_lib.rusttests", "release", new[] { "hello_lib-d9d78f0fcd1af879.exe", "int_tests-58f9d629627e8abd.exe" })] // Has tests.
+    [InlineData(@"hello_world", "hello_world_hello_world.rusttests", "release", new string[] { "hello_world-*.exe" })] // No tests.
+    [InlineData(@"hello_library", "hello_lib_libhello_lib.rusttests", "release", new[] { "hello_lib-*.exe", "int_tests-*.exe" })] // Has tests.
     [UseReporter(typeof(RaVsDiffReporter))]
     public async Task GetTestSuiteTestsAsync(string workspaceRelRoot, string containerName, string profile, string[] testExes)
     {
@@ -129,12 +131,12 @@ public async Task GetTestSuiteTestsAsync(string workspaceRelRoot, string contain
         var tc = JsonConvert.DeserializeObject<TestContainer>(await tcPath.ReadAllTextAsync(default));
 
         tc.TestExes.All(e => e.FileExists()).Should().BeTrue();
-        tc.TestExes.Select(e => e.GetFileName()).Should().BeEquivalentTo(testExes.Select(e => (PathEx)e));
+        tc.TestExes.Select(e => Regex.Replace(e.GetFileName(), @"\-[\da-f]{16}\.", "-*.", RegexOptions.IgnoreCase)).Should().BeEquivalentTo(testExes);
         tc.Profile.Should().Be(profile);
         tc.ThisPath.Should().Be(tcPath);
         testSuites.Should().HaveCount(testExes.Length);
         testSuites.Select(x => x.Container.ThisPath).Should().OnlyContain(x => x == tcPath);
-        var normalizedStr = testSuites.SerializeAndNormalizeObject();
+        var normalizedStr = testSuites.OrderBy(x => (string)x.Exe).SerializeAndNormalizeObject();
         Approvals.Verify(normalizedStr);
     }
 }

src/RustAnalyzer.TestAdapter/Common/StringExtensions.cs

@@ -37,7 +37,7 @@ public static string ReplaceNullWithBar(this string s)
         return s?.Replace("\0", "|");
     }
 
-    public static string RegexReplace(this string @this, string pattern, string replacement)
+    public static string RegexReplace(this string @this, string pattern, string replacement, RegexOptions options = RegexOptions.None)
     {
         return Regex.Replace(@this, pattern, replacement);
     }

src/TestsCommon/TestHelpers.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.IO;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using KS.RustAnalyzer.TestAdapter;
 using KS.RustAnalyzer.TestAdapter.Cargo;
@@ -86,7 +87,8 @@ public static string SerializeAndNormalizeObject(this object @this)
             .SerializeObject(Formatting.Indented, new PathExJsonConverter())
             .Replace(((string)ThisTestRoot).Replace("\\", "\\\\"), "<TestRoot>", StringComparison.OrdinalIgnoreCase)
             .RegexReplace(@"    ""(Start|End)Time"": ""(.*)"",", string.Empty)
-            .RegexReplace(@"    ""Duration"": ""00:00:00.2\d{6}"",", @"    ""Duration"": ""00:00:00.2000000""")
+            .RegexReplace(@"    ""Duration"": ""00:00:00.[0-2]\d{6}"",", @"    ""Duration"": ""00:00:00.2000000""")
+            .RegexReplace(@"\-[\da-f]{16}\.", "-*.", RegexOptions.IgnoreCase)
             .Replace("note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\\n", string.Empty);
     }