Re-enable xunit warning 2009 (dotnet/corefx#39847)
authorStephen Toub <stoub@microsoft.com>
Mon, 29 Jul 2019 13:42:13 +0000 (09:42 -0400)
committerGitHub <noreply@github.com>
Mon, 29 Jul 2019 13:42:13 +0000 (09:42 -0400)
Commit migrated from https://github.com/dotnet/corefx/commit/6737565ccbb8ceb484d349bd6844f7470bf23248

40 files changed:
src/libraries/CodeAnalysis.ruleset
src/libraries/Common/tests/Tests/System/StringTests.cs
src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/ApplicationServices/AssemblyInfoTests.cs
src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/CompareAttributeTests.cs
src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionExceptionTests.cs
src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ExportableAttributeTests.cs
src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/MetadataTests.cs
src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionMemberImportDefinitionTests.cs
src/libraries/System.Composition/tests/CardinalityTests.cs
src/libraries/System.Composition/tests/SharingTests.cs
src/libraries/System.Data.Common/tests/System/Data/DataRowTest2.cs
src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs
src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs
src/libraries/System.Diagnostics.Contracts/tests/ContractFailedTests.cs
src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs
src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs
src/libraries/System.Diagnostics.TraceSource/tests/DefaultTraceListenerClassTests.cs
src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.Etw.cs
src/libraries/System.DirectoryServices.Protocols/tests/DirectoryServicesProtocolsTests.cs
src/libraries/System.IO.Compression.ZipFile/tests/ZipFile.Create.cs
src/libraries/System.Linq.Expressions/tests/InterpreterTests.cs
src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs
src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http1.cs
src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs
src/libraries/System.Net.Mail/tests/Unit/MessageTests/MessageEncodeHeadersTest.cs
src/libraries/System.Net.Mail/tests/Unit/MessageTests/MessageHeaderBehaviorTest.cs
src/libraries/System.Net.Mail/tests/Unit/MessageTests/ReplyToListTest.cs
src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
src/libraries/System.Net.WebSockets.Client/tests/ConnectTest.cs
src/libraries/System.Private.Xml/tests/Misc/XmlUrlResolverTests.cs
src/libraries/System.Private.Xml/tests/XmlWriter/DisposeTests.cs
src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.netcoreapp.cs
src/libraries/System.Runtime/tests/System/DuplicateWaitObjectExceptionTests.cs
src/libraries/System.Runtime/tests/System/MissingFieldExceptionTests.cs
src/libraries/System.Runtime/tests/System/MissingMemberExceptionTests.cs
src/libraries/System.Runtime/tests/System/MissingMethodExceptionTests.cs
src/libraries/System.Security.Permissions/tests/PrincipalPermissionTests.cs
src/libraries/System.Text.Json/tests/Serialization/Object.ReadTests.cs
src/libraries/System.Text.Json/tests/Serialization/Value.WriteTests.GenericCollections.cs
src/libraries/System.Text.Json/tests/Serialization/Value.WriteTests.ImmutableCollections.cs

index df3027e..ecc03a3 100644 (file)
@@ -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 -->
index 46b6299..6fb35f2 100644 (file)
@@ -14,6 +14,8 @@ using System.Threading.Tasks;
 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.
index 328ca84..c74faac 100644 (file)
@@ -55,7 +55,7 @@ namespace Microsoft.VisualBasic.ApplicationServices.Tests
             // 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]
index a556783..0c5bb46 100644 (file)
@@ -87,13 +87,13 @@ namespace System.ComponentModel.DataAnnotations.Tests
             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
index fed5980..bc0ec31 100644 (file)
@@ -413,7 +413,7 @@ namespace System.ComponentModel.Composition
 
                 if (rootCauseCount == 1)
                 {
-                    Assert.True(line.Contains(SR.CompositionException_SingleErrorWithSinglePath));
+                    Assert.Contains(SR.CompositionException_SingleErrorWithSinglePath, line);
                 }
                 else
                 {
index 7081b80..309efda 100644 (file)
@@ -98,7 +98,7 @@ namespace System.ComponentModel.Composition
                 var metadata = export.Metadata;
             });
 
-            Assert.True(ex.Message.Contains("Bar"));
+            Assert.Contains("Bar", ex.Message);
         }
 
         [AttributeUsage(AttributeTargets.All)]
index cc160fc..d0c11b5 100644 (file)
@@ -260,7 +260,7 @@ namespace System.ComponentModel.Composition
                 var metadata = export.Metadata;
             });
 
-            Assert.True(ex.Message.Contains("DuplicateMetadataName"));
+            Assert.Contains("DuplicateMetadataName", ex.Message);
         }
 
         [PartNotDiscoverable]
@@ -283,7 +283,7 @@ namespace System.ComponentModel.Composition
                 var metadata = export.Metadata;
             });
 
-            Assert.True(ex.Message.Contains("DuplicateMetadataName"));
+            Assert.Contains("DuplicateMetadataName", ex.Message);
         }
 
         [Export]
@@ -353,7 +353,7 @@ namespace System.ComponentModel.Composition
                 var metadata = export.Metadata;
             });
 
-            Assert.True(ex.Message.Contains(CompositionConstants.PartCreationPolicyMetadataName));
+            Assert.Contains(CompositionConstants.PartCreationPolicyMetadataName, ex.Message);
         }
 
         #endregion
index a417d4f..e5835f9 100644 (file)
@@ -36,7 +36,7 @@ namespace System.ComponentModel.Composition.ReflectionModel
             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]
index c0aff2f..16f0936 100644 (file)
@@ -38,8 +38,8 @@ namespace System.Composition.UnitTests
             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 @@ namespace System.Composition.UnitTests
             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);
         }
     }
 }
index afc1e53..4ce6f93 100644 (file)
@@ -330,7 +330,7 @@ namespace System.Composition.UnitTests
             }
             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);
             }
         }
 
index 205c971..6cc363d 100644 (file)
@@ -2471,7 +2471,7 @@ namespace System.Data.Tests
             dr = dtParent.Rows[0];
 
             // ToString
-            Assert.True(dr.ToString().ToLower().StartsWith("system.data.datarow"));
+            Assert.StartsWith("system.data.datarow", dr.ToString().ToLower());
         }
 
         [Fact]
index 698052c..1fa20f2 100644 (file)
@@ -260,7 +260,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests
                     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();
index 1abb82e..f57126e 100644 (file)
@@ -357,9 +357,9 @@ namespace System.Data.SqlClient.ManualTesting.Tests
 
             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)
index 61b8dc0..e413769 100644 (file)
@@ -42,7 +42,7 @@ namespace System.Diagnostics.Contracts.Tests
             {
                 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 @@ namespace System.Diagnostics.Contracts.Tests
             {
                 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();
             }))
index 804f865..143b7fe 100644 (file)
@@ -585,7 +585,7 @@ namespace System.Diagnostics.Tests
                 activity.SetParentId(parentId);
                 activity.Start();
                 Assert.Equal(ActivityIdFormat.Hierarchical, activity.IdFormat);
-                Assert.True(activity.Id.StartsWith(parentId));
+                Assert.StartsWith(parentId, activity.Id);
             }).Dispose();
         }
 
index 9f82ae2..0bdfcd8 100644 (file)
@@ -215,7 +215,7 @@ namespace System.Diagnostics.Tests
                     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 @@ namespace System.Diagnostics.Tests
                 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 @@ namespace System.Diagnostics.Tests
 
                         // 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);
index 36bc7a7..4cd20de 100644 (file)
@@ -65,7 +65,7 @@ namespace System.Diagnostics.TraceSourceTests
             var listener = new TestDefaultTraceListener();
             listener.ShouldOverrideWriteLine = false;
             listener.Fail("FAIL");
-            Assert.False(listener.Output.Contains("FAIL"));
+            Assert.DoesNotContain("FAIL", listener.Output);
         }
 
         [Fact]
index 43333e3..e017e7e 100644 (file)
@@ -122,7 +122,7 @@ namespace BasicEventSourceTests
 
                     // 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"));
index 9b6e7cd..f520df2 100644 (file)
@@ -395,7 +395,7 @@ namespace System.DirectoryServicesProtocols.Tests
                         {
                             if (partialResult[i] is SearchResultEntry)
                             {
-                                Assert.True(((SearchResultEntry)partialResult[i]).DistinguishedName.Contains("Group9"));
+                                Assert.Contains("Group9", ((SearchResultEntry)partialResult[i]).DistinguishedName);
                             }
                         }
                     }
@@ -408,7 +408,7 @@ namespace System.DirectoryServicesProtocols.Tests
                     {
                         foreach (SearchResultEntry entry in response.Entries)
                         {
-                            Assert.True(entry.DistinguishedName.Contains("Group9"));
+                            Assert.Contains("Group9", entry.DistinguishedName);
                         }
                     }
                 }
index c3ab567..3e8f875 100644 (file)
@@ -35,7 +35,7 @@ namespace System.IO.Compression.Tests
                 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 @@ namespace System.IO.Compression.Tests
                 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);
                 }
             }
         }
index cab9fac..509b890 100644 (file)
@@ -202,7 +202,7 @@ namespace System.Linq.Expressions.Tests
 
         private static void AssertStackTrace(Exception ex, string searchTerm)
         {
-            Assert.True(ex.StackTrace.Contains(searchTerm));
+            Assert.Contains(searchTerm, ex.StackTrace);
         }
 
         private sealed class Thrower
index 2565533..8162da8 100644 (file)
@@ -1251,7 +1251,7 @@ namespace System.Net.Http.Functional.Tests
             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 @@ namespace System.Net.Http.Functional.Tests
             {
                 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);
             }
 
index 88b143e..b70aa89 100644 (file)
@@ -35,7 +35,7 @@ namespace System.Net.Http.Functional.Tests
                     string[] headers = (await server.AcceptConnectionSendResponseAndCloseAsync()).ToArray();
                     await sendTask;
 
-                    Assert.True(headers[1].StartsWith("Host"));
+                    Assert.StartsWith("Host", headers[1]);
                 }
             });
         }
index a92406c..04f6f0c 100644 (file)
@@ -2468,7 +2468,7 @@ namespace System.Net.Http.Functional.Tests
                         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);
                     }
                 }
             }
index 16a347e..6e78f9f 100644 (file)
@@ -21,8 +21,8 @@ namespace System.Net.Mail.Tests
             _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);
 
index 06c45ee..9e4188c 100644 (file)
@@ -117,10 +117,10 @@ namespace System.Net.Mail.Tests
             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 @@ namespace System.Net.Mail.Tests
             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 @@ namespace System.Net.Mail.Tests
 
             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]
index 4c1e0c6..d1ba0f0 100644 (file)
@@ -43,9 +43,9 @@ namespace System.Net.Mail.Tests
             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 @@ namespace System.Net.Mail.Tests
             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 @@ namespace System.Net.Mail.Tests
             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);
         }
index a8730a5..911d6e4 100644 (file)
@@ -119,9 +119,9 @@ namespace System.Net.Security.Tests
                         false));
 
                     Assert.NotNull(e.InnerException);
-                    Assert.True(e.InnerException.Message.Contains("SSL_ERROR_SSL"));
+                    Assert.Contains("SSL_ERROR_SSL", e.InnerException.Message);
                     Assert.NotNull(e.InnerException.InnerException);
-                    Assert.True(e.InnerException.InnerException.Message.Contains("protocol"));
+                    Assert.Contains("protocol", e.InnerException.InnerException.Message);
                 }
             }
 
index ab0f940..9b30067 100644 (file)
@@ -84,8 +84,8 @@ namespace System.Net.WebSockets.Client.Tests
 
                 Assert.Equal(WebSocketMessageType.Text, recvResult.MessageType);
                 string headers = WebSocketData.GetTextFromBuffer(new ArraySegment<byte>(buffer, 0, recvResult.Count));
-                Assert.True(headers.Contains("X-CustomHeader1:Value1"));
-                Assert.True(headers.Contains("X-CustomHeader2:Value2"));
+                Assert.Contains("X-CustomHeader1:Value1", headers);
+                Assert.Contains("X-CustomHeader2:Value2", headers);
 
                 await cws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
             }
@@ -154,8 +154,8 @@ namespace System.Net.WebSockets.Client.Tests
                 Assert.Equal(WebSocketMessageType.Text, recvResult.MessageType);
                 string headers = WebSocketData.GetTextFromBuffer(new ArraySegment<byte>(buffer, 0, recvResult.Count));
 
-                Assert.True(headers.Contains("Cookies=Are Yummy"));
-                Assert.True(headers.Contains("Especially=Chocolate Chip"));
+                Assert.Contains("Cookies=Are Yummy", headers);
+                Assert.Contains("Especially=Chocolate Chip", headers);
                 Assert.Equal(server.Scheme == "wss", headers.Contains("Occasionally=Raisin"));
 
                 await cws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
index ae7f394..a569d3b 100644 (file)
@@ -27,7 +27,7 @@ namespace System.Xml.Tests
             Uri resolvedUri = resolver.ResolveUri(baseUri, path);
 
             Assert.Equal(Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, path)), resolvedUri.LocalPath);
-            Assert.True(resolvedUri.LocalPath.EndsWith(path.Replace('/', Path.DirectorySeparatorChar)));
+            Assert.EndsWith(path.Replace('/', Path.DirectorySeparatorChar), resolvedUri.LocalPath);
         }
 
         [Theory]
index cab92bc..7757543 100644 (file)
@@ -101,7 +101,7 @@ namespace System.Xml.Tests
                                     else
                                     {
                                         string output = ReadAsString(ms);
-                                        Assert.True(output.Contains("<test>abc"));
+                                        Assert.Contains("<test>abc", output);
                                         Assert.NotEqual(output.Contains("<?xml version"), omitXmlDeclaration);
                                         Assert.Equal(output.Contains("  "), indent);
                                         Assert.Equal(output.Contains("</test>"), writeEndDocumentOnClose);
index af8d24f..4cc7db7 100644 (file)
@@ -156,7 +156,7 @@ namespace System.IO.Tests
                 }
                 else
                 {
-                    Assert.True(Path.GetFullPath(bad).EndsWith(bad));
+                    Assert.EndsWith(bad, Path.GetFullPath(bad));
                 }
                 Assert.Equal(string.Empty, Path.GetPathRoot(bad));
                 Assert.False(Path.IsPathRooted(bad));
index fad48a8..8375996 100644 (file)
@@ -24,7 +24,7 @@ namespace System.Tests
         {
             string parameterName = "THISISAPARAMETERNAME";
             var exception = new DuplicateWaitObjectException(parameterName);
-            Assert.True(exception.Message.Contains(parameterName));
+            Assert.Contains(parameterName, exception.Message);
             Assert.Equal(COR_E_DUPLICATEWAITOBJECT, exception.HResult);
         }
 
@@ -46,8 +46,8 @@ namespace System.Tests
             string parameterName = "THISISAPARAMETERNAME";
             string message = "CreatedDuplicateWaitObjectException";
             var exception = new DuplicateWaitObjectException(parameterName, message);
-            Assert.True(exception.Message.Contains(parameterName));
-            Assert.True(exception.Message.Contains(message));
+            Assert.Contains(parameterName, exception.Message);
+            Assert.Contains(message, exception.Message);
         }
     }
 }
index 072aab2..a46b2d7 100644 (file)
@@ -46,8 +46,8 @@ namespace System.Tests
             string className = "class";
             string memberName = "member";
             var exception = new MissingFieldException(className, memberName);
-            Assert.True(exception.Message.Contains(className));
-            Assert.True(exception.Message.Contains(memberName));
+            Assert.Contains(className, exception.Message);
+            Assert.Contains(memberName, exception.Message);
         }
     }
 }
index f643bb1..c463abb 100644 (file)
@@ -46,8 +46,8 @@ namespace System.Tests
             string className = "class";
             string memberName = "member";
             var exception = new MissingMemberException(className, memberName);
-            Assert.True(exception.Message.Contains(className));
-            Assert.True(exception.Message.Contains(memberName));
+            Assert.Contains(className, exception.Message);
+            Assert.Contains(memberName, exception.Message);
         }
     }
 }
index bc57c42..d0ff509 100644 (file)
@@ -45,8 +45,8 @@ namespace System.Tests
             string className = "class";
             string memberName = "member";
             var exception = new MissingMethodException(className, memberName);
-            Assert.True(exception.Message.Contains(className));
-            Assert.True(exception.Message.Contains(memberName));
+            Assert.Contains(className, exception.Message);
+            Assert.Contains(memberName, exception.Message);
         }
     }
 }
index 4817fa8..694fd06 100644 (file)
@@ -21,8 +21,8 @@ namespace System.Security.Permissions.Tests
             PrincipalPermission copy = (PrincipalPermission)p.Copy();
             Assert.Equal(p.IsUnrestricted(), copy.IsUnrestricted());
             SecurityElement se = p.ToXml();
-            Assert.True((se.Attributes["class"] as string).StartsWith(className));
-            Assert.Equal("1", (se.Attributes["version"] as string));
+            Assert.StartsWith(className, se.Attributes["class"] as string);
+            Assert.Equal("1", se.Attributes["version"] as string);
         }
 
         [Fact]
index 1996702..3c82ad2 100644 (file)
@@ -269,7 +269,7 @@ namespace System.Text.Json.Serialization.Tests
                 exceptionThrown = true;
 
                 // Exception should contain path.
-                Assert.True(exception.ToString().Contains("Path: $.Children[0].MyProperty"));
+                Assert.Contains("Path: $.Children[0].MyProperty", exception.ToString());
             }
 
             Assert.True(exceptionThrown);
index c555a7c..7f0319b 100644 (file)
@@ -450,8 +450,8 @@ namespace System.Text.Json.Serialization.Tests
             };
 
             string json = JsonSerializer.Serialize(input);
-            Assert.True(json.Contains("[1,2]"));
-            Assert.True(json.Contains("[3,4]"));
+            Assert.Contains("[1,2]", json);
+            Assert.Contains("[3,4]", json);
         }
 
         [Fact]
@@ -646,8 +646,8 @@ namespace System.Text.Json.Serialization.Tests
             });
 
             string json = JsonSerializer.Serialize(input);
-            Assert.True(json.Contains("[1,2]"));
-            Assert.True(json.Contains("[3,4]"));
+            Assert.Contains("[1,2]", json);
+            Assert.Contains("[3,4]", json);
         }
 
         [Fact]
index ed02ffd..3a7be82 100644 (file)
@@ -233,8 +233,8 @@ namespace System.Text.Json.Serialization.Tests
             });
 
             string json = JsonSerializer.Serialize(input);
-            Assert.True(json.Contains("[1,2]"));
-            Assert.True(json.Contains("[3,4]"));
+            Assert.Contains("[1,2]", json);
+            Assert.Contains("[3,4]", json);
         }
 
         [Fact]
@@ -247,8 +247,8 @@ namespace System.Text.Json.Serialization.Tests
             });
 
             string json = JsonSerializer.Serialize(input);
-            Assert.True(json.Contains("[1,2]"));
-            Assert.True(json.Contains("[3,4]"));
+            Assert.Contains("[1,2]", json);
+            Assert.Contains("[3,4]", json);
         }
 
         [Fact]
@@ -285,8 +285,8 @@ namespace System.Text.Json.Serialization.Tests
             });
 
             string json = JsonSerializer.Serialize(input);
-            Assert.True(json.Contains("[1,2]"));
-            Assert.True(json.Contains("[3,4]"));
+            Assert.Contains("[1,2]", json);
+            Assert.Contains("[3,4]", json);
         }
 
         [Fact]
@@ -299,8 +299,8 @@ namespace System.Text.Json.Serialization.Tests
             });
 
             string json = JsonSerializer.Serialize(input);
-            Assert.True(json.Contains("[1,2]"));
-            Assert.True(json.Contains("[3,4]"));
+            Assert.Contains("[1,2]", json);
+            Assert.Contains("[3,4]", json);
         }
 
         [Fact]