Updated deprecated test functions

Updated Assert functions to non-deprecated equivalents.

Author: mizady

Tests/HttpUnitTests/MediaTypeHeaderValueTest.cs

@@ -16,7 +16,7 @@ internal class MediaTypeHeaderValueTests
         [TestMethod]
         public void Ctor_MediaTypeNull_Throw()
         {
-            Assert.Throws(typeof(ArgumentException),
+            Assert.ThrowsException(typeof(ArgumentException),
                 () =>
                 {
                     new MediaTypeHeaderValue(null);
@@ -27,7 +27,7 @@ public void Ctor_MediaTypeNull_Throw()
         public void Ctor_MediaTypeEmpty_Throw()
         {
             // null and empty should be treated the same. So we also throw for empty strings.
-            Assert.Throws(typeof(ArgumentException),
+            Assert.ThrowsException(typeof(ArgumentException),
                  () =>
                  {
                      new MediaTypeHeaderValue(string.Empty);
@@ -46,43 +46,45 @@ public void Ctor_MediaTypeInvalidFormat_ThrowFormatException()
         public void Ctor_MediaTypeValidFormat_SuccessfullyCreated()
         {
             MediaTypeHeaderValue mediaType = new MediaTypeHeaderValue("text/plain");
-            Assert.Equal("text/plain", mediaType.MediaType);
-            Assert.Null(mediaType.CharSet);
+            Assert.AreEqual("text/plain", mediaType.MediaType);
+            Assert.IsNull(mediaType.CharSet);
         }
 
         [TestMethod]
         public void MediaType_SetAndGetMediaType_MatchExpectations()
         {
             MediaTypeHeaderValue mediaType = new MediaTypeHeaderValue("text/plain");
-            Assert.Equal("text/plain", mediaType.MediaType);
+            Assert.AreEqual("text/plain", mediaType.MediaType);
 
             mediaType.MediaType = "application/xml";
-            Assert.Equal("application/xml", mediaType.MediaType);
+            Assert.AreEqual("application/xml", mediaType.MediaType);
         }
 
         [TestMethod]
         public void CharSet_SetCharSetAndValidateObject_ParametersEntryForCharSetAdded()
         {
-            MediaTypeHeaderValue mediaType = new MediaTypeHeaderValue("text/plain");
-            mediaType.CharSet = "mycharset";
-            Assert.Equal("mycharset", mediaType.CharSet);
+            MediaTypeHeaderValue mediaType = new MediaTypeHeaderValue("text/plain")
+            {
+                CharSet = "mycharset"
+            };
+            Assert.AreEqual("mycharset", mediaType.CharSet);
 
             mediaType.CharSet = null;
-            Assert.Null(mediaType.CharSet);
+            Assert.IsNull(mediaType.CharSet);
             mediaType.CharSet = null; 
         }
 
         [TestMethod]
         public void ToString_UseDifferentMediaTypes_AllSerializedCorrectly()
         {
             MediaTypeHeaderValue mediaType = new MediaTypeHeaderValue("text/plain");
-            Assert.Equal("text/plain", mediaType.ToString());
+            Assert.AreEqual("text/plain", mediaType.ToString());
 
             mediaType.CharSet = "utf-8";
-            Assert.Equal("text/plain; charset=utf-8", mediaType.ToString());
+            Assert.AreEqual("text/plain; charset=utf-8", mediaType.ToString());
 
             mediaType.CharSet = null;
-            Assert.Equal("text/plain", mediaType.ToString());
+            Assert.AreEqual("text/plain", mediaType.ToString());
         }
 
         [TestMethod]
@@ -93,9 +95,9 @@ public void GetHashCode_UseMediaTypeWithoutParameters_SameOrDifferentHashCodes()
             mediaType2.CharSet = "utf-8";
             MediaTypeHeaderValue mediaType3 = new MediaTypeHeaderValue("text/plain");
 
-            Assert.NotEqual(mediaType1.GetHashCode(), mediaType2.GetHashCode());
-            Assert.NotEqual(mediaType1.GetHashCode(), mediaType3.GetHashCode());
-            Assert.NotEqual(mediaType2.GetHashCode(), mediaType3.GetHashCode());
+            Assert.AreNotEqual(mediaType1.GetHashCode(), mediaType2.GetHashCode());
+            Assert.AreNotEqual(mediaType1.GetHashCode(), mediaType3.GetHashCode());
+            Assert.AreNotEqual(mediaType2.GetHashCode(), mediaType3.GetHashCode());
         }
 
         [TestMethod]
@@ -106,10 +108,10 @@ public void Equals_UseMediaTypeWithoutParameters_EqualOrNotEqualNoExceptions()
             mediaType2.CharSet = "utf-8";
             MediaTypeHeaderValue mediaType7 = new MediaTypeHeaderValue("text/other");
 
-            Assert.False(mediaType1.Equals(mediaType2), "No params vs. charset.");
-            Assert.False(mediaType2.Equals(mediaType1), "charset vs. no params.");
-            Assert.False(mediaType1.Equals(null), "No params vs. <null>.");
-            Assert.False(mediaType1.Equals(mediaType7), "text/plain vs. text/other.");
+            Assert.IsFalse(mediaType1.Equals(mediaType2), "No params vs. charset.");
+            Assert.IsFalse(mediaType2.Equals(mediaType1), "charset vs. no params.");
+            Assert.IsFalse(mediaType1.Equals(null), "No params vs. <null>.");
+            Assert.IsFalse(mediaType1.Equals(mediaType7), "text/plain vs. text/other.");
         }
 
         [TestMethod]
@@ -144,7 +146,7 @@ public void Parse_SetOfInvalidValueStrings_Throws()
 
         private static void AssertFormatException(string mediaType)
         {
-            Assert.Throws(typeof(FormatException),
+            Assert.ThrowsException(typeof(FormatException),
                 () => 
                 { 
                     new MediaTypeHeaderValue(mediaType); 
@@ -156,12 +158,12 @@ private void CheckValidParse(
             MediaTypeHeaderValue expectedResult)
         {
             MediaTypeHeaderValue result = MediaTypeHeaderValue.Parse(input);
-            Assert.Equal(expectedResult.ToString(), result.ToString());
+            Assert.AreEqual(expectedResult.ToString(), result.ToString());
         }
 
         private void CheckInvalidParse(string input, Type exceptionType)
         {
-            Assert.Throws(exceptionType,
+            Assert.ThrowsException(exceptionType,
                 () => 
                 { 
                     MediaTypeHeaderValue.Parse(input); 

Tests/HttpUnitTests/StringContentTest.cs

@@ -18,7 +18,7 @@ public class StringContentTest
         [TestMethod]
         public void Ctor_NullString_ThrowsArgumentNullException()
         {
-            Assert.Throws(typeof(ArgumentNullException),
+            Assert.ThrowsException(typeof(ArgumentNullException),
                 () => new StringContent(null));
         }
 
@@ -28,7 +28,7 @@ public void Ctor_EmptyString_Accept()
             // Consider empty strings like null strings (null and empty strings should be treated equally).
             var content = new StringContent(string.Empty);
             Stream result = content.ReadAsStream();
-            Assert.Equal(0, result.Length);
+            Assert.AreEqual(0, result.Length);
         }
 
         [TestMethod]
@@ -39,18 +39,18 @@ public void Ctor_DefineNoEncoding_DefaultEncodingUsed()
             Encoding defaultStringEncoding = Encoding.UTF8;
 
             // If no encoding is defined, the default encoding is used: utf-8
-            Assert.Equal("text/plain", content.Headers.ContentType.MediaType);
-            Assert.Equal("utf-8", content.Headers.ContentType.CharSet);
+            Assert.AreEqual("text/plain", content.Headers.ContentType.MediaType);
+            Assert.AreEqual("utf-8", content.Headers.ContentType.CharSet);
 
             // Make sure the default encoding is also used when serializing the content.
             var destination = new MemoryStream();
             content.CopyTo(destination);
 
-            Assert.Equal(8, destination.Length);
+            Assert.AreEqual(8, destination.Length);
 
             destination.Seek(0, SeekOrigin.Begin);
             string roundTrip = new StreamReader(destination).ReadToEnd();
-            Assert.Equal(sourceString, roundTrip);
+            Assert.AreEqual(sourceString, roundTrip);
         }
     }
 }