Use RegexGenerator in applicable tests (#66179)

Author: Clockwork-Muse

src/libraries/System.Configuration.ConfigurationManager/tests/Mono/ConfigurationErrorsExceptionTest.cs

@@ -49,7 +49,7 @@ public void Constructor1()
             // \p{Pi} any kind of opening quote https://www.compart.com/en/unicode/category/Pi
             // \p{Pf} any kind of closing quote https://www.compart.com/en/unicode/category/Pf
             // \p{Po} any kind of punctuation character that is not a dash, bracket, quote or connector https://www.compart.com/en/unicode/category/Po
-            Assert.True(Regex.IsMatch(cee.BareMessage, @"[\p{Pi}\p{Po}]" + Regex.Escape(typeof(ConfigurationErrorsException).FullName) + @"[\p{Pf}\p{Po}]"), "#2:" + cee.BareMessage);
+            Assert.Matches(@"[\p{Pi}\p{Po}]" + Regex.Escape(typeof(ConfigurationErrorsException).FullName) + @"[\p{Pf}\p{Po}]", cee.BareMessage);
 
             Assert.NotNull(cee.Data);
             Assert.Equal(0, cee.Data.Count);

src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs

@@ -340,7 +340,7 @@ public void ToString_ShowILOffset()
                 catch (Exception e)
                 {
                     Assert.Contains(asmName, e.InnerException.StackTrace);
-                    Assert.True(Regex.Match(e.InnerException.StackTrace, p).Success);
+                    Assert.Matches(p, e.InnerException.StackTrace);
                 }
             }, SourceTestAssemblyPath, AssemblyName, regPattern).Dispose();
 
@@ -357,7 +357,7 @@ public void ToString_ShowILOffset()
                 catch (Exception e)
                 {
                     Assert.Contains(asmName, e.InnerException.StackTrace);
-                    Assert.True(Regex.Match(e.InnerException.StackTrace, p).Success);
+                    Assert.Matches(p, e.InnerException.StackTrace);
                 }
             }, SourceTestAssemblyPath, AssemblyName, regPattern).Dispose();
 
@@ -381,7 +381,7 @@ public void ToString_ShowILOffset()
                 catch (Exception e)
                 {
                     Assert.Contains("RefEmit_InMemoryManifestModule", e.InnerException.StackTrace);
-                    Assert.True(Regex.Match(e.InnerException.StackTrace, p).Success);
+                    Assert.Matches(p, e.InnerException.StackTrace);
                 }
             }, regPattern).Dispose();
         }

src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs

@@ -51,7 +51,7 @@ private void Test_BadTypes_Manifest(EventSource source)
 
                     string message = _event.PayloadString(0, "message");
                     // expected message: "ERROR: Exception in Command Processing for EventSource BadEventSource_Bad_Type_ByteArray: Unsupported type Byte[] in event source. "
-                    Assert.Matches("Unsupported type", message);
+                    Assert.Contains("Unsupported type", message);
                 }
             }
             finally
@@ -126,7 +126,7 @@ private void Test_Bad_EventSource_Startup(bool onStartup, Listener listener, Eve
             Debug.WriteLine(string.Format("Message=\"{0}\"", message));
             // expected message: "ERROR: Exception in Command Processing for EventSource BadEventSource_MismatchedIds: Event Event2 was assigned event ID 2 but 1 was passed to WriteEvent. "
             if (!PlatformDetection.IsNetFramework) // .NET Framework has typo
-                Assert.Matches("Event Event2 was assigned event ID 2 but 1 was passed to WriteEvent", message);
+                Assert.Contains("Event Event2 was assigned event ID 2 but 1 was passed to WriteEvent", message);
 
             // Validate the details of the EventWrittenEventArgs object
             if (_event is EventListenerListener.EventListenerEvent elEvent)
@@ -158,46 +158,28 @@ public void Test_Bad_WriteRelatedID_ParameterName()
 #if true
             Debug.WriteLine("Test disabled because the fix it tests is not in CoreCLR yet.");
 #else
-            BadEventSource_IncorrectWriteRelatedActivityIDFirstParameter bes = null;
-            EventListenerListener listener = null;
-            try
-            {
-                Guid oldGuid;
-                Guid newGuid = Guid.NewGuid();
-                Guid newGuid2 = Guid.NewGuid();
-                EventSource.SetCurrentThreadActivityId(newGuid, out oldGuid);
-
-                bes = new BadEventSource_IncorrectWriteRelatedActivityIDFirstParameter();
+            Guid oldGuid;
+            Guid newGuid = Guid.NewGuid();
+            Guid newGuid2 = Guid.NewGuid();
+            EventSource.SetCurrentThreadActivityId(newGuid, out oldGuid);
 
-                using (var listener = new EventListenerListener())
-                {
-                    var events = new List<Event>();
-                    listener.OnEvent = delegate (Event data) { events.Add(data); };
+            using (var bes = new BadEventSource_IncorrectWriteRelatedActivityIDFirstParameter())
+            using (var listener = new EventListenerListener())
+            {
+                var events = new List<Event>();
+                listener.OnEvent = delegate (Event data) { events.Add(data); };
 
-                    listener.EventSourceCommand(bes.Name, EventCommand.Enable);
+                listener.EventSourceCommand(bes.Name, EventCommand.Enable);
 
-                    bes.RelatedActivity(newGuid2, "Hello", 42, "AA", "BB");
+                bes.RelatedActivity(newGuid2, "Hello", 42, "AA", "BB");
 
-                    // Confirm that we get exactly one event from this whole process, that has the error message we expect.
-                    Assert.Equal(1, events.Count);
-                    Event _event = events[0];
-                    Assert.Equal("EventSourceMessage", _event.EventName);
-                    string message = _event.PayloadString(0, "message");
-                    // expected message: "EventSource expects the first parameter of the Event method to be of type Guid and to be named "relatedActivityId" when calling WriteEventWithRelatedActivityId."
-                    Assert.True(Regex.IsMatch(message, "EventSource expects the first parameter of the Event method to be of type Guid and to be named \"relatedActivityId\" when calling WriteEventWithRelatedActivityId."));
-                }
-            }
-            finally
-            {
-                if (bes != null)
-                {
-                    bes.Dispose();
-                }
-
-                if (listener != null)
-                {
-                    listener.Dispose();
-                }
+                // Confirm that we get exactly one event from this whole process, that has the error message we expect.
+                Assert.Equal(1, events.Count);
+                Event _event = events[0];
+                Assert.Equal("EventSourceMessage", _event.EventName);
+                string message = _event.PayloadString(0, "message");
+                // expected message: "EventSource expects the first parameter of the Event method to be of type Guid and to be named "relatedActivityId" when calling WriteEventWithRelatedActivityId."
+                Assert.Contains("EventSource expects the first parameter of the Event method to be of type Guid and to be named \"relatedActivityId\" when calling WriteEventWithRelatedActivityId.", message);
             }
 #endif
         }

src/libraries/System.IO.Pipelines/tests/PipeReaderWriterFacts.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;

src/libraries/System.Linq.Expressions/tests/CompilerTests.cs

@@ -3,7 +3,6 @@
 
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
-using System.Threading;
 using Xunit;
 
 namespace System.Linq.Expressions.Tests
@@ -385,15 +384,15 @@ internal static void VerifyIL(this LambdaExpression expression, string expected,
 
         private static string Normalize(string s)
         {
+            var normalizeRegex = new Regex(@"lambda_method[0-9]*");
+
             Collections.Generic.IEnumerable<string> lines =
                 s
-                .Replace("\r\n", "\n")
-                .Split(new[] { '\n' })
-                .Select(line => line.Trim())
-                .Where(line => line != "" && !line.StartsWith("//"));
+                .Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+                .Where(line => !line.StartsWith("//"))
+                .Select(beforeLambdaUniquifierRemoval => normalizeRegex.Replace(beforeLambdaUniquifierRemoval, "lambda_method"));
 
-            string beforeLambdaUniquifierRemoval = string.Join("\n", lines);
-            return Regex.Replace(beforeLambdaUniquifierRemoval, "lambda_method[0-9]*", "lambda_method");
+            return string.Join("\n", lines);
         }
 
         private static void VerifyEmitConstantsToIL<T>(T value)

src/libraries/System.Linq.Expressions/tests/DelegateType/GetDelegateTypeTests.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
 using Xunit;
 
 namespace System.Linq.Expressions.Tests
@@ -66,8 +65,8 @@ public void CantBeFunc(Type[] typeArgs)
             {
                 Type delType = Expression.GetDelegateType(typeArgs);
                 Assert.True(typeof(MulticastDelegate).IsAssignableFrom(delType));
-                Assert.DoesNotMatch(new Regex(@"System\.Action"), delType.FullName);
-                Assert.DoesNotMatch(new Regex(@"System\.Func"), delType.FullName);
+                Assert.DoesNotContain("System.Action", delType.FullName);
+                Assert.DoesNotContain("System.Func", delType.FullName);
                 Reflection.MethodInfo method = delType.GetMethod("Invoke");
                 Assert.Equal(typeArgs.Last(), method.ReturnType);
                 Assert.Equal(typeArgs.Take(typeArgs.Length - 1), method.GetParameters().Select(p => p.ParameterType));
@@ -92,8 +91,8 @@ public void CantBeAction(Type[] typeArgs)
             {
                 Type delType = Expression.GetDelegateType(delegateArgs);
                 Assert.True(typeof(MulticastDelegate).IsAssignableFrom(delType));
-                Assert.DoesNotMatch(new Regex(@"System\.Action"), delType.FullName);
-                Assert.DoesNotMatch(new Regex(@"System\.Func"), delType.FullName);
+                Assert.DoesNotContain("System.Action", delType.FullName);
+                Assert.DoesNotContain("System.Func", delType.FullName);
                 Reflection.MethodInfo method = delType.GetMethod("Invoke");
                 Assert.Equal(typeof(void), method.ReturnType);
                 Assert.Equal(typeArgs, method.GetParameters().Select(p => p.ParameterType));

src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj

@@ -6,6 +6,7 @@
     <!-- Too much private reflection. Do not bother with trimming -->
     <ILLinkTrimAssembly>false</ILLinkTrimAssembly>
     <Nullable>enable</Nullable>
+    <EnableRegexGenerator>true</EnableRegexGenerator>
   </PropertyGroup>
   <PropertyGroup>
     <RuntimeSerializationSources>System\Runtime\Serialization</RuntimeSerializationSources>

src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs

@@ -2215,7 +2215,7 @@ internal static bool IsAssemblyFriendOfSerialization(Assembly assembly)
                 string internalsVisibleAttributeAssemblyName = internalsVisibleAttribute.AssemblyName;
 
                 if (internalsVisibleAttributeAssemblyName.Trim().Equals("System.Runtime.Serialization") ||
-                    Regex.IsMatch(internalsVisibleAttributeAssemblyName, Globals.FullSRSInternalsVisiblePattern))
+                    Globals.FullSRSInternalsVisibleRegex().IsMatch(internalsVisibleAttributeAssemblyName))
                 {
                     return true;
                 }
@@ -2238,7 +2238,8 @@ internal interface IGenericNameProvider
         [RequiresUnreferencedCode(DataContract.SerializerTrimmerWarning)]
         string GetNamespaces();
         string GetGenericTypeName();
-        bool ParametersFromBuiltInNamespaces {
+        bool ParametersFromBuiltInNamespaces
+        {
             [RequiresUnreferencedCode(DataContract.SerializerTrimmerWarning)]
             get;
         }

src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Globals.cs

@@ -9,13 +9,14 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
 
 namespace System.Runtime.Serialization
 {
-    internal static class Globals
+    internal static partial class Globals
     {
         /// <SecurityNote>
         /// Review - changes to const could affect code generation logic; any changes should be reviewed.
@@ -831,6 +832,8 @@ internal static bool TypeOfScriptObject_IsAssignableFrom(Type type)
         public static readonly string NewObjectId = string.Empty;
         public const string NullObjectId = null;
         public const string FullSRSInternalsVisiblePattern = @"^[\s]*System\.Runtime\.Serialization[\s]*,[\s]*PublicKey[\s]*=[\s]*(?i:00240000048000009400000006020000002400005253413100040000010001008d56c76f9e8649383049f383c44be0ec204181822a6c31cf5eb7ef486944d032188ea1d3920763712ccb12d75fb77e9811149e6148e5d32fbaab37611c1878ddc19e20ef135d0cb2cff2bfec3d115810c3d9069638fe4be215dbf795861920e5ab6f7db2e2ceef136ac23d5dd2bf031700aec232f6c6b1c785b4305c123b37ab)[\s]*$";
+        [RegexGenerator(FullSRSInternalsVisiblePattern)]
+        public static partial Regex FullSRSInternalsVisibleRegex();
         public const string Space = " ";
         public const string XsiPrefix = "i";
         public const string XsdPrefix = "x";

src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Windows.cs

@@ -328,8 +328,8 @@ public static void GetFullPath_Windows_83Paths()
 
                     // Make sure the shortened name expands back to the original one
                     // Sometimes shortening or GetFullPath is changing the casing of "temp" on some test machines: normalize both sides
-                    tempFilePath = Regex.Replace(tempFilePath, @"\\temp\\", @"\TEMP\", RegexOptions.IgnoreCase);
-                    shortName = Regex.Replace(Path.GetFullPath(shortName), @"\\temp\\", @"\TEMP\", RegexOptions.IgnoreCase);
+                    tempFilePath = tempFilePath.Replace(@"\\temp\\", @"\TEMP\", ignoreCase: true, culture: null);
+                    shortName = Path.GetFullPath(shortName).Replace(@"\\temp\\", @"\TEMP\", ignoreCase: true, culture: null);
                     Assert.Equal(tempFilePath, shortName);
 
                     // Should work with device paths that aren't well-formed extended syntax

src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj

@@ -9,6 +9,7 @@
     <Nullable>disable</Nullable>
     <!-- Disable nullability public only feature for NullabilityInfoContextTests -->
     <Features>$(Features.Replace('nullablePublicOnly', '')</Features>
+    <EnableRegexGenerator>true</EnableRegexGenerator>
   </PropertyGroup>
   <PropertyGroup>
     <DefineConstants Condition="'$(FeatureGenericMath)' == 'true'">$(DefineConstants);FEATURE_GENERIC_MATH</DefineConstants>

src/libraries/System.Runtime/tests/System/ExceptionTests.cs

@@ -78,7 +78,7 @@ public static void Exception_TargetSite()
 
             Assert.True(caught);
         }
-        
+
         static void RethrowException()
         {
             try
@@ -136,7 +136,7 @@ private static (string, string, int) ThrowAndRethrowSameMethod(out (string, stri
             }
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotArm64Process))] 
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotArm64Process))]
         // [ActiveIssue(https://github.com/dotnet/runtime/issues/1871)] can't use ActiveIssue for archs
         [ActiveIssue("https://github.com/mono/mono/issues/15141", TestRuntimes.Mono)]
         public static void ThrowStatementDoesNotResetExceptionStackLineOtherMethod()
@@ -198,7 +198,7 @@ private static void VerifyCallStack(
                     var match = Regex.Match(frame, frameParserRegex);
                     Assert.True(match.Success);
                     Assert.Equal(expectedStackFrame.CallerMemberName, match.Groups["memberName"].Value);
-                    
+
                     if (PlatformDetection.IsLineNumbersSupported)
                     {
                         Assert.Equal(expectedStackFrame.SourceFilePath, match.Groups["filePath"].Value);

src/libraries/System.Runtime/tests/System/Runtime/ExceptionServices/ExceptionDispatchInfoTests.cs

@@ -24,7 +24,7 @@ public static void StaticThrow_UpdatesStackTraceAppropriately()
             for (int i = 0; i < 3; i++)
             {
                 Assert.Same(e, Assert.Throws<FormatException>(() => ExceptionDispatchInfo.Throw(e)));
-                Assert.Equal(i, Regex.Matches(e.StackTrace, RethrowMessageSubstring).Count);
+                Assert.Equal(i, Regex.Count(e.StackTrace, RethrowMessageSubstring));
             }
         }
 

src/libraries/System.Runtime/tests/System/Text/Unicode/Utf8Tests.cs

@@ -62,7 +62,7 @@ static Utf8Tests()
 
         public static byte[] DecodeHex(ReadOnlySpan<char> inputHex)
         {
-            Assert.True(Regex.IsMatch(inputHex.ToString(), "^([0-9a-fA-F]{2})*$"), "Input must be an even number of hex characters.");
+            Assert.Matches(@"^([0-9a-fA-F]{2})*$", inputHex.ToString());
 
             return Convert.FromHexString(inputHex);
         }