From 126ee116cf6f04ad31f03faca7ca4d5554563090 Mon Sep 17 00:00:00 2001 From: dougbu Date: Thu, 24 Jul 2014 16:37:16 -0700 Subject: [PATCH] Remove useless `.ToString()` calls in tests --- .../HtmlHelperDisplayNameExtensionsTest.cs | 56 ++++++++-------- .../Rendering/HtmlHelperNameExtensionsTest.cs | 64 +++++++++---------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs index 783cc39480..551899f7f5 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs @@ -31,11 +31,11 @@ namespace Microsoft.AspNet.Mvc.Core var displayNameForModelResult = helper.DisplayNameForModel(); // Assert - Assert.Empty(displayNameResult.ToString()); - Assert.Empty(displayNameNullResult.ToString()); - Assert.Empty(displayNameForResult.ToString()); - Assert.Empty(displayNameForEnumerableModelResult.ToString()); - Assert.Empty(displayNameForModelResult.ToString()); + Assert.Empty(displayNameResult); + Assert.Empty(displayNameNullResult); + Assert.Empty(displayNameForResult); + Assert.Empty(displayNameForEnumerableModelResult); + Assert.Empty(displayNameForModelResult); } [Fact] @@ -52,9 +52,9 @@ namespace Microsoft.AspNet.Mvc.Core var displayNameForEnumerableResult = enumerableHelper.DisplayNameFor(m => m.Property1); // Assert - Assert.Equal("Property1", displayNameResult.ToString()); - Assert.Equal("Property1", displayNameForResult.ToString()); - Assert.Equal("Property1", displayNameForEnumerableResult.ToString()); + Assert.Equal("Property1", displayNameResult); + Assert.Equal("Property1", displayNameForResult); + Assert.Equal("Property1", displayNameForEnumerableResult); } [Fact] @@ -71,9 +71,9 @@ namespace Microsoft.AspNet.Mvc.Core var displayNameForEnumerableResult = enumerableHelper.DisplayNameFor(m => m.Inner.Id); // Assert - Assert.Equal("Id", displayNameResult.ToString()); - Assert.Equal("Id", displayNameForResult.ToString()); - Assert.Equal("Id", displayNameForEnumerableResult.ToString()); + Assert.Equal("Id", displayNameResult); + Assert.Equal("Id", displayNameForResult); + Assert.Equal("Id", displayNameForEnumerableResult); } [Theory] @@ -102,10 +102,10 @@ namespace Microsoft.AspNet.Mvc.Core var displayNameForModelResult = helper.DisplayNameForModel(); // Assert - Assert.Equal(propertyName, displayNameResult.ToString()); - Assert.Equal(propertyName, displayNameForResult.ToString()); - Assert.Equal(propertyName, displayNameForEnumerableResult.ToString()); - Assert.Equal(propertyName, displayNameForModelResult.ToString()); + Assert.Equal(propertyName, displayNameResult); + Assert.Equal(propertyName, displayNameForResult); + Assert.Equal(propertyName, displayNameForEnumerableResult); + Assert.Equal(propertyName, displayNameForModelResult); } [Theory] @@ -136,8 +136,8 @@ namespace Microsoft.AspNet.Mvc.Core var displayNameForEnumerableResult = enumerableHelper.DisplayNameFor(m => m.Property1); // Assert - Assert.Equal(propertyName, displayNameForResult.ToString()); - Assert.Equal(propertyName, displayNameForEnumerableResult.ToString()); + Assert.Equal(propertyName, displayNameForResult); + Assert.Equal(propertyName, displayNameForEnumerableResult); } [Theory] @@ -159,10 +159,10 @@ namespace Microsoft.AspNet.Mvc.Core var displayNameForModelResult = helper.DisplayNameForModel(); // Assert - Assert.Equal(displayName, displayNameResult.ToString()); - Assert.Equal(displayName, displayNameForResult.ToString()); - Assert.Equal(displayName, displayNameForEnumerableResult.ToString()); - Assert.Equal(displayName, displayNameForModelResult.ToString()); + Assert.Equal(displayName, displayNameResult); + Assert.Equal(displayName, displayNameForResult); + Assert.Equal(displayName, displayNameForEnumerableResult); + Assert.Equal(displayName, displayNameForModelResult); } [Theory] @@ -187,9 +187,9 @@ namespace Microsoft.AspNet.Mvc.Core var displayNameForEnumerableResult = enumerableHelper.DisplayNameFor(m => m.Property1); // Assert - Assert.Equal(displayName, displayNameResult.ToString()); - Assert.Equal(displayName, displayNameForResult.ToString()); - Assert.Equal(displayName, displayNameForEnumerableResult.ToString()); + Assert.Equal(displayName, displayNameResult); + Assert.Equal(displayName, displayNameForResult); + Assert.Equal(displayName, displayNameForEnumerableResult); } [Theory] @@ -210,7 +210,7 @@ namespace Microsoft.AspNet.Mvc.Core // Assert // DisplayName() falls back to expression name when DisplayName and PropertyName are null. - Assert.Equal(expectedResult, result.ToString()); + Assert.Equal(expectedResult, result); } [Fact] @@ -233,7 +233,7 @@ namespace Microsoft.AspNet.Mvc.Core metadataHelper.MetadataProvider.Verify(); // DisplayNameFor() falls back to expression name when DisplayName and PropertyName are null. - Assert.Equal("Property1", result.ToString()); + Assert.Equal("Property1", result); } [Fact] @@ -276,7 +276,7 @@ namespace Microsoft.AspNet.Mvc.Core var result = helper.DisplayNameFor(model => unknownKey); // Assert - Assert.Equal("unknownKey", result.ToString()); + Assert.Equal("unknownKey", result); } [Fact] @@ -291,7 +291,7 @@ namespace Microsoft.AspNet.Mvc.Core var result = helper.DisplayNameFor(model => unknownKey); // Assert - Assert.Equal("unknownKey", result.ToString()); + Assert.Equal("unknownKey", result); } private sealed class InnerClass diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperNameExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperNameExtensionsTest.cs index 40fdb737cd..2c775bae2a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperNameExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/HtmlHelperNameExtensionsTest.cs @@ -35,14 +35,14 @@ namespace Microsoft.AspNet.Mvc.Core var nameForModelResult = helper.NameForModel(); // Assert - Assert.Empty(idResult.ToString()); - Assert.Empty(idNullResult.ToString()); - Assert.Empty(idForResult.ToString()); - Assert.Empty(idForModelResult.ToString()); - Assert.Empty(nameResult.ToString()); - Assert.Empty(nameNullResult.ToString()); - Assert.Empty(nameForResult.ToString()); - Assert.Empty(nameForModelResult.ToString()); + Assert.Empty(idResult); + Assert.Empty(idNullResult); + Assert.Empty(idForResult); + Assert.Empty(idForModelResult); + Assert.Empty(nameResult); + Assert.Empty(nameNullResult); + Assert.Empty(nameForResult); + Assert.Empty(nameForModelResult); } [Theory] @@ -66,12 +66,12 @@ namespace Microsoft.AspNet.Mvc.Core var nameForModelResult = helper.NameForModel(); // Assert - Assert.Equal(prefix, idResult.ToString()); - Assert.Equal(prefix, idForResult.ToString()); - Assert.Equal(prefix, idForModelResult.ToString()); - Assert.Equal(prefix, nameResult.ToString()); - Assert.Equal(prefix, nameForResult.ToString()); - Assert.Equal(prefix, nameForModelResult.ToString()); + Assert.Equal(prefix, idResult); + Assert.Equal(prefix, idForResult); + Assert.Equal(prefix, idForModelResult); + Assert.Equal(prefix, nameResult); + Assert.Equal(prefix, nameForResult); + Assert.Equal(prefix, nameForModelResult); } [Fact] @@ -87,10 +87,10 @@ namespace Microsoft.AspNet.Mvc.Core var nameForResult = helper.NameFor(m => m.Property1); // Assert - Assert.Equal("Property1", idResult.ToString()); - Assert.Equal("Property1", idForResult.ToString()); - Assert.Equal("Property1", nameResult.ToString()); - Assert.Equal("Property1", nameForResult.ToString()); + Assert.Equal("Property1", idResult); + Assert.Equal("Property1", idForResult); + Assert.Equal("Property1", nameResult); + Assert.Equal("Property1", nameForResult); } [Theory] @@ -112,10 +112,10 @@ namespace Microsoft.AspNet.Mvc.Core var nameForResult = helper.NameFor(m => m.Property1); // Assert - Assert.Equal("Property1", idResult.ToString()); - Assert.Equal("Property1", idForResult.ToString()); - Assert.Equal("Property1", nameResult.ToString()); - Assert.Equal("Property1", nameForResult.ToString()); + Assert.Equal("Property1", idResult); + Assert.Equal("Property1", idForResult); + Assert.Equal("Property1", nameResult); + Assert.Equal("Property1", nameForResult); } [Fact] @@ -131,10 +131,10 @@ namespace Microsoft.AspNet.Mvc.Core var nameForResult = helper.NameFor(m => m.Inner.Id); // Assert - Assert.Equal("Inner.Id", idResult.ToString()); - Assert.Equal("Inner.Id", idForResult.ToString()); - Assert.Equal("Inner.Id", nameResult.ToString()); - Assert.Equal("Inner.Id", nameForResult.ToString()); + Assert.Equal("Inner.Id", idResult); + Assert.Equal("Inner.Id", idForResult); + Assert.Equal("Inner.Id", nameResult); + Assert.Equal("Inner.Id", nameForResult); } [Fact] @@ -207,8 +207,8 @@ namespace Microsoft.AspNet.Mvc.Core var nameResult = helper.Name(expression); // Assert - Assert.Equal(expression, idResult.ToString()); - Assert.Equal(expression, nameResult.ToString()); + Assert.Equal(expression, idResult); + Assert.Equal(expression, nameResult); } [Fact] @@ -222,8 +222,8 @@ namespace Microsoft.AspNet.Mvc.Core var nameResult = helper.NameFor(model => new { foo = "Bar" }); // Assert - Assert.Empty(idResult.ToString()); - Assert.Empty(nameResult.ToString()); + Assert.Empty(idResult); + Assert.Empty(nameResult); } [Fact] @@ -238,8 +238,8 @@ namespace Microsoft.AspNet.Mvc.Core var nameResult = helper.NameFor(model => unknownKey); // Assert - Assert.Equal("unknownKey", idResult.ToString()); - Assert.Equal("unknownKey", nameResult.ToString()); + Assert.Equal("unknownKey", idResult); + Assert.Equal("unknownKey", nameResult); } private sealed class InnerClass