Re-enable xunit warning 2009 (dotnet/corefx#39847)

stephentoub · web-flow · commit d24aa292ac9f · 2019-07-29T09:42:13.000-04:00
Commit migrated from dotnet/corefx@6737565
diff --git a/src/libraries/CodeAnalysis.ruleset b/src/libraries/CodeAnalysis.ruleset
@@ -80,7 +80,6 @@
     <Rule Id="xUnit1026" Action="None" /> <!-- Theory methods should use all of their parameters -->
     <Rule Id="xUnit2005" Action="None" /> <!-- Do not use identity check on value type -->
     <Rule Id="xUnit2006" Action="None" /> <!-- Do not use invalid string equality check -->
-    <Rule Id="xUnit2009" Action="None" /> <!-- Do not use boolean check to check for substrings -->
     <Rule Id="xUnit2013" Action="None" /> <!-- Do not use equality check to check for collection size. -->
     <Rule Id="xUnit2017" Action="None" /> <!-- Do not use Contains() to check if a value exists in a collection -->
     <Rule Id="xUnit2018" Action="None" /> <!-- Do not compare an object's exact type to an abstract class or interface -->
diff --git a/src/libraries/Common/tests/Tests/System/StringTests.cs b/src/libraries/Common/tests/Tests/System/StringTests.cs
@@ -14,6 +14,8 @@
 using Microsoft.DotNet.RemoteExecutor;
 using Xunit;
 
+#pragma warning disable xUnit2009 // these are the tests for String and so should be using the explicit methods on String
+
 namespace System.Tests
 {
     //When add new tests make sure to add checks for both string and span APIs where relevant.
diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/ApplicationServices/AssemblyInfoTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/ApplicationServices/AssemblyInfoTests.cs
@@ -55,7 +55,7 @@ public void StackTrace()
             // Property is independent of the actual assembly.
             var assemblyInfo = new AssemblyInfo(Assembly.GetExecutingAssembly());
             var stackTrace = assemblyInfo.StackTrace;
-            Assert.True(stackTrace.Contains(nameof(AssemblyInfoTests)));
+            Assert.Contains(nameof(AssemblyInfoTests), stackTrace);
         }
 
         [Fact]
diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/CompareAttributeTests.cs b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/CompareAttributeTests.cs
@@ -87,13 +87,13 @@ public static void Validate_PropertyHasDisplayName_UpdatesFormatErrorMessageToCo
             CompareAttribute attribute = new CompareAttribute(nameof(CompareObject.ComparePropertyWithDisplayName));
 
             string oldErrorMessage = attribute.FormatErrorMessage("name");
-            Assert.False(oldErrorMessage.Contains("CustomDisplayName"));
+            Assert.DoesNotContain("CustomDisplayName", oldErrorMessage);
 
             Assert.Throws<ValidationException>(() => attribute.Validate("test1", new ValidationContext(new CompareObject("test"))));
 
             string newErrorMessage = attribute.FormatErrorMessage("name");
             Assert.NotEqual(oldErrorMessage, newErrorMessage);
-            Assert.True(newErrorMessage.Contains("CustomDisplayName"));
+            Assert.Contains("CustomDisplayName", newErrorMessage);
         }
         
         private class DerivedCompareAttribute : CompareAttribute
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionExceptionTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionExceptionTests.cs
@@ -413,7 +413,7 @@ private void AssertMessage(CompositionException exception, int rootCauseCount, C
 
                 if (rootCauseCount == 1)
                 {
-                    Assert.True(line.Contains(SR.CompositionException_SingleErrorWithSinglePath));
+                    Assert.Contains(SR.CompositionException_SingleErrorWithSinglePath, line);
                 }
                 else
                 {
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ExportableAttributeTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ExportableAttributeTests.cs
@@ -98,7 +98,7 @@ public void InvalidMetadataAttributeTest()
                 var metadata = export.Metadata;
             });
 
-            Assert.True(ex.Message.Contains("Bar"));
+            Assert.Contains("Bar", ex.Message);
         }
 
         [AttributeUsage(AttributeTargets.All)]
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/MetadataTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/MetadataTests.cs
@@ -260,7 +260,7 @@ public void InvalidDuplicateMetadataOnType_ShouldThrow()
                 var metadata = export.Metadata;
             });
 
-            Assert.True(ex.Message.Contains("DuplicateMetadataName"));
+            Assert.Contains("DuplicateMetadataName", ex.Message);
         }
 
         [PartNotDiscoverable]
@@ -283,7 +283,7 @@ public void InvalidDuplicateMetadataOnMember_ShouldThrow()
                 var metadata = export.Metadata;
             });
 
-            Assert.True(ex.Message.Contains("DuplicateMetadataName"));
+            Assert.Contains("DuplicateMetadataName", ex.Message);
         }
 
         [Export]
@@ -353,7 +353,7 @@ public void InvalidMetadata_UseOfReservedName_ShouldThrow()
                 var metadata = export.Metadata;
             });
 
-            Assert.True(ex.Message.Contains(CompositionConstants.PartCreationPolicyMetadataName));
+            Assert.Contains(CompositionConstants.PartCreationPolicyMetadataName, ex.Message);
         }
 
         #endregion
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinitionTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinitionTests.cs
@@ -36,7 +36,7 @@ public void Constructor()
             Assert.False(definition.IsPrerequisite);
             Assert.Null(((ICompositionElement)definition).Origin);
             Assert.NotNull(((ICompositionElement)definition).DisplayName);
-            Assert.True(((ICompositionElement)definition).DisplayName.Contains(expectedMember.GetDisplayName()));
+            Assert.Contains(expectedMember.GetDisplayName(), ((ICompositionElement)definition).DisplayName);
         }
 
         [Fact]
diff --git a/src/libraries/System.Composition/tests/CardinalityTests.cs b/src/libraries/System.Composition/tests/CardinalityTests.cs
@@ -38,8 +38,8 @@ public void RequestingOneWhereMultipleArePresentFails()
             var c = CreateContainer(typeof(LogA), typeof(LogB));
             var x = Assert.Throws<CompositionFailedException>(() =>
                 c.GetExport<ILog>());
-            Assert.True(x.Message.Contains("LogA"));
-            Assert.True(x.Message.Contains("LogB"));
+            Assert.Contains("LogA", x.Message);
+            Assert.Contains("LogB", x.Message);
         }
 
         [Fact]
@@ -49,8 +49,8 @@ public void ImportingOneWhereMultipleArePresentFails()
             var c = CreateContainer(typeof(LogA), typeof(LogB), typeof(UsesLog));
             var x = Assert.Throws<CompositionFailedException>(() =>
                 c.GetExport<UsesLog>());
-            Assert.True(x.Message.Contains("LogA"));
-            Assert.True(x.Message.Contains("LogB"));
+            Assert.Contains("LogA", x.Message);
+            Assert.Contains("LogB", x.Message);
         }
     }
 }
diff --git a/src/libraries/System.Composition/tests/SharingTests.cs b/src/libraries/System.Composition/tests/SharingTests.cs
@@ -330,7 +330,7 @@ public void BoundaryExposedBoundaryButNoneImported()
             }
             catch (Exception ex)
             {
-                Assert.True(ex.Message.Contains("The component (unknown) cannot be created outside the Boundary sharing boundary"));
+                Assert.Contains("The component (unknown) cannot be created outside the Boundary sharing boundary", ex.Message);
             }
         }
 
diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataRowTest2.cs b/src/libraries/System.Data.Common/tests/System/Data/DataRowTest2.cs
@@ -2471,7 +2471,7 @@ public void Table()
             dr = dtParent.Rows[0];
 
             // ToString
-            Assert.True(dr.ToString().ToLower().StartsWith("system.data.datarow"));
+            Assert.StartsWith("system.data.datarow", dr.ToString().ToLower());
         }
 
         [Fact]
diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs
@@ -260,7 +260,7 @@ private static void TimeOutDuringRead(string constr)
                     proxy.PauseCopying();
                     string errorMessage = SystemDataResourceManager.Instance.SQL_Timeout;
                     Exception exception = Assert.Throws<SqlException>(() => reader.GetValue(0));
-                    Assert.True(exception.Message.Contains(errorMessage));
+                    Assert.Contains(errorMessage, exception.Message);
 
                     // Return everything to normal and close
                     proxy.ResumeCopying();
diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
@@ -357,9 +357,9 @@ private static void AssertSqlUdtAssemblyQualifiedName(string assemblyQualifiedNa
 
             Assert.Equal(expectedType, type);
             Assert.Equal("Microsoft.SqlServer.Types", assembly);
-            Assert.True(version.StartsWith("Version"));
-            Assert.True(culture.StartsWith("Culture"));
-            Assert.True(token.StartsWith("PublicKeyToken"));
+            Assert.StartsWith("Version", version);
+            Assert.StartsWith("Culture", culture);
+            Assert.StartsWith("PublicKeyToken", token);
         }
 
         private static string ToHexString(byte[] bytes)
diff --git a/src/libraries/System.Diagnostics.Contracts/tests/ContractFailedTests.cs b/src/libraries/System.Diagnostics.Contracts/tests/ContractFailedTests.cs
@@ -42,7 +42,7 @@ public static void DefaultEventArgValues()
             {
                 Assert.Null(e.Condition);
                 Assert.False(e.Handled);
-                Assert.True(e.Message.Contains(message));
+                Assert.Contains(message, e.Message);
                 Assert.False(e.Unwind);
                 e.SetHandled();
             }))
@@ -54,7 +54,7 @@ public static void DefaultEventArgValues()
             {
                 Assert.Null(e.Condition);
                 Assert.False(e.Handled);
-                Assert.True(e.Message.Contains(message));
+                Assert.Contains(message, e.Message);
                 Assert.False(e.Unwind);
                 e.SetHandled();
             }))
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs
@@ -585,7 +585,7 @@ public void IdFormat_HierarchicalWhenDefaultIsW3CButHierarchicalParentId()
                 activity.SetParentId(parentId);
                 activity.Start();
                 Assert.Equal(ActivityIdFormat.Hierarchical, activity.IdFormat);
-                Assert.True(activity.Id.StartsWith(parentId));
+                Assert.StartsWith(parentId, activity.Id);
             }).Dispose();
         }
 
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs
@@ -215,7 +215,7 @@ public async Task TestW3CHeadersTraceStateAndCorrelationContext()
                     Assert.NotNull(traceparent);
                     Assert.Equal("some=state", tracestate);
                     Assert.Equal("k=v", correlationContext);
-                    Assert.True(traceparent.StartsWith($"00-{parent.TraceId.ToHexString()}-"));
+                    Assert.StartsWith($"00-{parent.TraceId.ToHexString()}-", traceparent);
                     Assert.Matches("^[0-9a-f]{2}-[0-9a-f]{32}-[0-9a-f]{16}-[0-9a-f]{2}$", traceparent);
                     Assert.Null(startRequest.Headers["Request-Id"]);
                 }
@@ -413,7 +413,7 @@ public async Task TestActivityIsCreated()
                 var correlationContext = thisRequest.Headers["Correlation-Context"];
 
                 Assert.NotNull(requestId);
-                Assert.True(requestId.StartsWith(parentActivity.Id));
+                Assert.StartsWith(parentActivity.Id, requestId);
 
                 Assert.NotNull(correlationContext);
                 Assert.True(correlationContext == "k1=v1,k2=v2" || correlationContext == "k2=v2,k1=v1");
@@ -607,7 +607,7 @@ public void TestMultipleConcurrentRequests()
 
                         // all requests have Request-Id with proper parent Id
                         var requestId = request.Headers["Request-Id"];
-                        Assert.True(requestId.StartsWith(parentActivity.Id));
+                        Assert.StartsWith(parentActivity.Id, requestId);
                         // all request activities are siblings:
                         var childSuffix = requestId.Substring(0, parentActivity.Id.Length);
                         Assert.True(childSuffix.IndexOf('.') == childSuffix.Length - 1);
diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/DefaultTraceListenerClassTests.cs b/src/libraries/System.Diagnostics.TraceSource/tests/DefaultTraceListenerClassTests.cs
@@ -65,7 +65,7 @@ public void Fail_WithoutWriteLineOverride()
             var listener = new TestDefaultTraceListener();
             listener.ShouldOverrideWriteLine = false;
             listener.Fail("FAIL");
-            Assert.False(listener.Output.Contains("FAIL"));
+            Assert.DoesNotContain("FAIL", listener.Output);
         }
 
         [Fact]
diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.Etw.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.Etw.cs
@@ -122,7 +122,7 @@ static partial void Test_WriteEvent_AddEtwTests(List<SubTest> tests, EventSource
 
                     // We log EventWithXferWeirdArgs in one case and 
                     // WorkWeirdArgs/Send in the other
-                    Assert.True(evt.EventName.Contains("WeirdArgs"));
+                    Assert.Contains("WeirdArgs", evt.EventName);
 
                     Assert.Equal("128", evt.PayloadValue(0, "iptr").ToString());
                     Assert.True((bool)evt.PayloadValue(1, "b"));
diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/DirectoryServicesProtocolsTests.cs b/src/libraries/System.DirectoryServices.Protocols/tests/DirectoryServicesProtocolsTests.cs
@@ -395,7 +395,7 @@ private static void RunAsyncSearch(IAsyncResult asyncResult)
                         {
                             if (partialResult[i] is SearchResultEntry)
                             {
-                                Assert.True(((SearchResultEntry)partialResult[i]).DistinguishedName.Contains("Group9"));
+                                Assert.Contains("Group9", ((SearchResultEntry)partialResult[i]).DistinguishedName);
                             }
                         }
                     }
@@ -408,7 +408,7 @@ private static void RunAsyncSearch(IAsyncResult asyncResult)
                     {
                         foreach (SearchResultEntry entry in response.Entries)
                         {
-                            Assert.True(entry.DistinguishedName.Contains("Group9"));
+                            Assert.Contains("Group9", entry.DistinguishedName);
                         }
                     }
                 }
diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/ZipFile.Create.cs b/src/libraries/System.IO.Compression.ZipFile/tests/ZipFile.Create.cs
@@ -35,7 +35,7 @@ public void CreateFromDirectory_IncludeBaseDirectory()
                 foreach (ZipArchiveEntry actualEntry in actual_withbasedir.Entries)
                 {
                     string expectedFile = expected.Single(i => Path.GetFileName(i).Equals(actualEntry.Name));
-                    Assert.True(actualEntry.FullName.StartsWith("normal"));
+                    Assert.StartsWith("normal", actualEntry.FullName);
                     Assert.Equal(new FileInfo(expectedFile).Length, actualEntry.Length);
                     using (Stream expectedStream = File.OpenRead(expectedFile))
                     using (Stream actualStream = actualEntry.Open())
@@ -77,7 +77,7 @@ public void CreatedEmptyDirectoriesRoundtrip()
                 using (ZipArchive archive = ZipFile.OpenRead(archivePath))
                 {
                     Assert.Equal(1, archive.Entries.Count);
-                    Assert.True(archive.Entries[0].FullName.StartsWith("empty1"));
+                    Assert.StartsWith("empty1", archive.Entries[0].FullName);
                 }
             }
         }
diff --git a/src/libraries/System.Linq.Expressions/tests/InterpreterTests.cs b/src/libraries/System.Linq.Expressions/tests/InterpreterTests.cs
@@ -202,7 +202,7 @@ private static void AssertStackTrace(Action a, string searchTerm)
 
         private static void AssertStackTrace(Exception ex, string searchTerm)
         {
-            Assert.True(ex.StackTrace.Contains(searchTerm));
+            Assert.Contains(searchTerm, ex.StackTrace);
         }
 
         private sealed class Thrower
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs
@@ -1251,7 +1251,7 @@ private static void AssertHeadersAreInjected(List<string> requestLines, Activity
             if (parent.IdFormat == ActivityIdFormat.Hierarchical)
             {
                 Assert.True(requestId != null, "Request-Id was not injected when instrumentation was enabled");
-                Assert.True(requestId.StartsWith(parent.Id));
+                Assert.StartsWith(parent.Id, requestId);
                 Assert.NotEqual(parent.Id, requestId);
                 Assert.Null(traceparent);
                 Assert.Null(tracestate);
@@ -1260,7 +1260,7 @@ private static void AssertHeadersAreInjected(List<string> requestLines, Activity
             {
                 Assert.Null(requestId);
                 Assert.True(traceparent != null, "traceparent was not injected when W3C instrumentation was enabled");
-                Assert.True(traceparent.StartsWith($"00-{parent.TraceId.ToHexString()}-"));
+                Assert.StartsWith($"00-{parent.TraceId.ToHexString()}-", traceparent);
                 Assert.Equal(parent.TraceStateString, tracestate);
             }
 
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http1.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http1.cs
@@ -35,7 +35,7 @@ await LoopbackServer.CreateServerAsync(async (server, url) =>
                     string[] headers = (await server.AcceptConnectionSendResponseAndCloseAsync()).ToArray();
                     await sendTask;
 
-                    Assert.True(headers[1].StartsWith("Host"));
+                    Assert.StartsWith("Host", headers[1]);
                 }
             });
         }
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs
@@ -2468,7 +2468,7 @@ public async Task SendAsync_SendRequestUsingNoBodyMethodToEchoServerWithContent_
                         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
                         TestHelper.VerifyRequestMethod(response, method);
                         string responseContent = await response.Content.ReadAsStringAsync();
-                        Assert.False(responseContent.Contains(ExpectedContent));
+                        Assert.DoesNotContain(ExpectedContent, responseContent);
                     }
                 }
             }
diff --git a/src/libraries/System.Net.Mail/tests/Unit/MessageTests/MessageEncodeHeadersTest.cs b/src/libraries/System.Net.Mail/tests/Unit/MessageTests/MessageEncodeHeadersTest.cs
@@ -21,8 +21,8 @@ public void EncodeHeaders_WithCustomUnicodeHeaders_ShouldEncodeHeaders()
             _message.EncodeHeaders(_headers, false);
 
             string encodedHeader = _headers.Get("X-Custom");
-            Assert.True(encodedHeader.StartsWith("="));
-            Assert.True(encodedHeader.EndsWith("="));
+            Assert.StartsWith("=", encodedHeader);
+            Assert.EndsWith("=", encodedHeader);
             //should contain no unicode
             Assert.False(ContainsNonAscii(encodedHeader), encodedHeader);
 
diff --git a/src/libraries/System.Net.Mail/tests/Unit/MessageTests/MessageHeaderBehaviorTest.cs b/src/libraries/System.Net.Mail/tests/Unit/MessageTests/MessageHeaderBehaviorTest.cs
@@ -117,10 +117,10 @@ public void Message_WithTo_WithCc_WithBcc_WithReplyToList_ShouldBeSingletons_Sho
             Assert.Equal(1, replyToHeaders.Length);
 
             //all headers that were set via properties should remain
-            Assert.True(fromHeaders[0].Contains(validFrom));
-            Assert.True(toHeaders[0].Contains(validTo));
-            Assert.True(ccHeaders[0].Contains(validCc));
-            Assert.True(replyToHeaders[0].Contains(validReplyTo));
+            Assert.Contains(validFrom, fromHeaders[0]);
+            Assert.Contains(validTo, toHeaders[0]);
+            Assert.Contains(validCc, ccHeaders[0]);
+            Assert.Contains(validReplyTo, replyToHeaders[0]);
         }
 
         [Fact]
@@ -140,9 +140,9 @@ public void MessagePriority_WithValueSetByHeader_AndImportanceNotSet_ShouldRespe
             Assert.True(_message.Headers.GetValues("X-Priority").Length == 1, "x-priority was not set");
             Assert.True(_message.Headers.GetValues("Priority").Length == 1, "priority was not set");
 
-            Assert.True(_message.Headers.GetValues("Importance")[0].Contains("low"));
-            Assert.True(_message.Headers.GetValues("X-Priority")[0].Contains("5"));
-            Assert.True(_message.Headers.GetValues("Priority")[0].Contains("non-urgent"));
+            Assert.Contains("low", _message.Headers.GetValues("Importance")[0]);
+            Assert.Contains("5", _message.Headers.GetValues("X-Priority")[0]);
+            Assert.Contains("non-urgent", _message.Headers.GetValues("Priority")[0]);
         }
 
         [Fact]
@@ -155,7 +155,7 @@ public void MessageSubject_WhenSetViaHeaders_AndSubjectPropertyIsSet_ShouldUsePr
 
             Assert.Equal("correct subject", _message.Subject);
             Assert.True(_message.Headers.GetValues("Subject").Length == 1);
-            Assert.True(_message.Headers.GetValues("Subject")[0].Contains("correct subject"));
+            Assert.Contains("correct subject", _message.Headers.GetValues("Subject")[0]);
         }
 
         [Fact]
diff --git a/src/libraries/System.Net.Mail/tests/Unit/MessageTests/ReplyToListTest.cs b/src/libraries/System.Net.Mail/tests/Unit/MessageTests/ReplyToListTest.cs
@@ -43,9 +43,9 @@ public void PrepareHeaders_WithReplyToSet_ShouldIgnoreReplyToList()
             string[] s = _message.Headers.GetValues("Reply-To");
             Assert.Equal(1, s.Length);
 
-            Assert.False(s[0].Contains("test@example.com"));
-            Assert.False(s[0].Contains("test2@example.com"));
-            Assert.True(s[0].Contains("test3@example.com"));
+            Assert.DoesNotContain("test@example.com", s[0]);
+            Assert.DoesNotContain("test2@example.com", s[0]);
+            Assert.Contains("test3@example.com", s[0]);
         }
 
         [Fact]
@@ -68,9 +68,9 @@ public void PrepareHeaders_WithReplyToNull_AndReplyToListSet_ShouldUseReplyToLis
             string[] s = _message.Headers.GetValues("Reply-To");
             Assert.Equal(1, s.Length);
 
-            Assert.True(s[0].Contains("test@example.com"));
-            Assert.True(s[0].Contains("test2@example.com"));
-            Assert.True(s[0].Contains("test3@example.com"));
+            Assert.Contains("test@example.com", s[0]);
+            Assert.Contains("test2@example.com", s[0]);
+            Assert.Contains("test3@example.com", s[0]);
 
             Assert.Null(_message.ReplyTo);
         }
@@ -97,10 +97,10 @@ public void PrepareHeaders_WithReplyToListSet_AndReplyToHeaderSetManually_Should
             string[] s = _message.Headers.GetValues("Reply-To");
             Assert.Equal(1, s.Length);
 
-            Assert.True(s[0].Contains("test@example.com"));
-            Assert.True(s[0].Contains("test2@example.com"));
-            Assert.True(s[0].Contains("test3@example.com"));
-            Assert.False(s[0].Contains("shouldnotbeset@example.com"));
+            Assert.Contains("test@example.com", s[0]);
+            Assert.Contains("test2@example.com", s[0]);
+            Assert.Contains("test3@example.com", s[0]);
+            Assert.DoesNotContain("shouldnotbeset@example.com", s[0]);
 
             Assert.Null(_message.ReplyTo);
         }
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
diff --git a/src/libraries/System.Net.WebSockets.Client/tests/ConnectTest.cs b/src/libraries/System.Net.WebSockets.Client/tests/ConnectTest.cs
diff --git a/src/libraries/System.Private.Xml/tests/Misc/XmlUrlResolverTests.cs b/src/libraries/System.Private.Xml/tests/Misc/XmlUrlResolverTests.cs
diff --git a/src/libraries/System.Private.Xml/tests/XmlWriter/DisposeTests.cs b/src/libraries/System.Private.Xml/tests/XmlWriter/DisposeTests.cs
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.netcoreapp.cs b/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.netcoreapp.cs
diff --git a/src/libraries/System.Runtime/tests/System/DuplicateWaitObjectExceptionTests.cs b/src/libraries/System.Runtime/tests/System/DuplicateWaitObjectExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MissingFieldExceptionTests.cs b/src/libraries/System.Runtime/tests/System/MissingFieldExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MissingMemberExceptionTests.cs b/src/libraries/System.Runtime/tests/System/MissingMemberExceptionTests.cs
diff --git a/src/libraries/System.Runtime/tests/System/MissingMethodExceptionTests.cs b/src/libraries/System.Runtime/tests/System/MissingMethodExceptionTests.cs
diff --git a/src/libraries/System.Security.Permissions/tests/PrincipalPermissionTests.cs b/src/libraries/System.Security.Permissions/tests/PrincipalPermissionTests.cs
diff --git a/src/libraries/System.Text.Json/tests/Serialization/Object.ReadTests.cs b/src/libraries/System.Text.Json/tests/Serialization/Object.ReadTests.cs
diff --git a/src/libraries/System.Text.Json/tests/Serialization/Value.WriteTests.GenericCollections.cs b/src/libraries/System.Text.Json/tests/Serialization/Value.WriteTests.GenericCollections.cs
diff --git a/src/libraries/System.Text.Json/tests/Serialization/Value.WriteTests.ImmutableCollections.cs b/src/libraries/System.Text.Json/tests/Serialization/Value.WriteTests.ImmutableCollections.cs

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`using Microsoft.DotNet.RemoteExecutor;`
`15`	`15`	`using Xunit;`
`16`	`16`
	`17`	`+#pragma warning disable xUnit2009 // these are the tests for String and so should be using the explicit methods on String`
	`18`	`+`
`17`	`19`	`namespace System.Tests`
`18`	`20`	`{`
`19`	`21`	`//When add new tests make sure to add checks for both string and span APIs where relevant.`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void StackTrace()`
`55`	`55`	`// Property is independent of the actual assembly.`
`56`	`56`	`var assemblyInfo = new AssemblyInfo(Assembly.GetExecutingAssembly());`
`57`	`57`	`var stackTrace = assemblyInfo.StackTrace;`
`58`		`- Assert.True(stackTrace.Contains(nameof(AssemblyInfoTests)));`
	`58`	`+ Assert.Contains(nameof(AssemblyInfoTests), stackTrace);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ private void AssertMessage(CompositionException exception, int rootCauseCount, C`
`413`	`413`
`414`	`414`	`if (rootCauseCount == 1)`
`415`	`415`	`{`
`416`		`- Assert.True(line.Contains(SR.CompositionException_SingleErrorWithSinglePath));`
	`416`	`+ Assert.Contains(SR.CompositionException_SingleErrorWithSinglePath, line);`
`417`	`417`	`}`
`418`	`418`	`else`
`419`	`419`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public void InvalidMetadataAttributeTest()`
`98`	`98`	`var metadata = export.Metadata;`
`99`	`99`	`});`
`100`	`100`
`101`		`- Assert.True(ex.Message.Contains("Bar"));`
	`101`	`+ Assert.Contains("Bar", ex.Message);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`[AttributeUsage(AttributeTargets.All)]`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ public void InvalidDuplicateMetadataOnType_ShouldThrow()`
`260`	`260`	`var metadata = export.Metadata;`
`261`	`261`	`});`
`262`	`262`
`263`		`- Assert.True(ex.Message.Contains("DuplicateMetadataName"));`
	`263`	`+ Assert.Contains("DuplicateMetadataName", ex.Message);`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`[PartNotDiscoverable]`
`@@ -283,7 +283,7 @@ public void InvalidDuplicateMetadataOnMember_ShouldThrow()`
`283`	`283`	`var metadata = export.Metadata;`
`284`	`284`	`});`
`285`	`285`
`286`		`- Assert.True(ex.Message.Contains("DuplicateMetadataName"));`
	`286`	`+ Assert.Contains("DuplicateMetadataName", ex.Message);`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`[Export]`
`@@ -353,7 +353,7 @@ public void InvalidMetadata_UseOfReservedName_ShouldThrow()`
`353`	`353`	`var metadata = export.Metadata;`
`354`	`354`	`});`
`355`	`355`
`356`		`- Assert.True(ex.Message.Contains(CompositionConstants.PartCreationPolicyMetadataName));`
	`356`	`+ Assert.Contains(CompositionConstants.PartCreationPolicyMetadataName, ex.Message);`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void Constructor()`
`36`	`36`	`Assert.False(definition.IsPrerequisite);`
`37`	`37`	`Assert.Null(((ICompositionElement)definition).Origin);`
`38`	`38`	`Assert.NotNull(((ICompositionElement)definition).DisplayName);`
`39`		`- Assert.True(((ICompositionElement)definition).DisplayName.Contains(expectedMember.GetDisplayName()));`
	`39`	`+ Assert.Contains(expectedMember.GetDisplayName(), ((ICompositionElement)definition).DisplayName);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public void RequestingOneWhereMultipleArePresentFails()`
`38`	`38`	`var c = CreateContainer(typeof(LogA), typeof(LogB));`
`39`	`39`	`var x = Assert.Throws<CompositionFailedException>(() =>`
`40`	`40`	`c.GetExport<ILog>());`
`41`		`- Assert.True(x.Message.Contains("LogA"));`
`42`		`- Assert.True(x.Message.Contains("LogB"));`
	`41`	`+ Assert.Contains("LogA", x.Message);`
	`42`	`+ Assert.Contains("LogB", x.Message);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`[Fact]`
`@@ -49,8 +49,8 @@ public void ImportingOneWhereMultipleArePresentFails()`
`49`	`49`	`var c = CreateContainer(typeof(LogA), typeof(LogB), typeof(UsesLog));`
`50`	`50`	`var x = Assert.Throws<CompositionFailedException>(() =>`
`51`	`51`	`c.GetExport<UsesLog>());`
`52`		`- Assert.True(x.Message.Contains("LogA"));`
`53`		`- Assert.True(x.Message.Contains("LogB"));`
	`52`	`+ Assert.Contains("LogA", x.Message);`
	`53`	`+ Assert.Contains("LogB", x.Message);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ public void BoundaryExposedBoundaryButNoneImported()`
`330`	`330`	`}`
`331`	`331`	`catch (Exception ex)`
`332`	`332`	`{`
`333`		`- Assert.True(ex.Message.Contains("The component (unknown) cannot be created outside the Boundary sharing boundary"));`
	`333`	`+ Assert.Contains("The component (unknown) cannot be created outside the Boundary sharing boundary", ex.Message);`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`