Removed commented out code and unnecessary compiler directives

fluentassertions · Jun 21, 2018 · 80333a9 · 80333a9
1 parent 7505d88
commit 80333a9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 38 deletions.
diff --git a/src/FluentAssertions.Mvc.Shared/JsonResultAssertions.cs b/src/FluentAssertions.Mvc.Shared/JsonResultAssertions.cs
@@ -2,11 +2,7 @@
 using System.Text;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
-#if NETSTANDARD1_6
-using Microsoft.AspNetCore.Mvc;
-#else
 using System.Web.Mvc;
-#endif
 
 namespace FluentAssertions.Mvc
 {
@@ -71,7 +67,6 @@ public JsonResultAssertions WithData(Func<object, bool> dataCondition, string re
             return this;
         }
 
-#if !NETSTANDARD1_6
         /// <summary>
         /// Asserts that the content encoding is the expected content encoding type.
         /// </summary>
@@ -94,7 +89,5 @@ public JsonResultAssertions WithContentEncoding(Encoding expectedEncoding, strin
 
             return this;
         }
-#endif
-
     }
 }
diff --git a/tests/FluentAssertions.Mvc.Tests.Shared/JsonResultAssertions_Tests.cs b/tests/FluentAssertions.Mvc.Tests.Shared/JsonResultAssertions_Tests.cs
@@ -3,11 +3,7 @@
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
-#if NETCOREAPP1_0
-using Microsoft.AspNetCore.Mvc;
-#else
 using System.Web.Mvc;
-#endif
 
 namespace FluentAssertions.Mvc.Tests
 {
@@ -121,34 +117,8 @@ public void WithDataPredicate_ShouldFail()
             act.Should().Throw<Exception>().WithMessage(expectedMessage);
         }
 
-        //[Test]
-        //public void WithData_DataIsDifferentObjectOfSameValue()
-        //{
-        //    var actualData = new ObjectWithEquality("hello world");
-        //    var expectedData = new ObjectWithEquality("hello world");
-
-        //    ActionResult result = new JsonResult { Data = actualData };
-
-        //    result.Should().BeJsonResult().WithData(expectedData);
-        //}
-
-        //[Test]
-        //public void WithData_DataIsDifferentObjectOfDifferentValue()
-        //{
-        //    var actualData = new ObjectWithEquality("hello world");
-        //    var expectedData = new ObjectWithEquality("goodbye cruel world");
-        //    var expectedMessage = string.Format(FailureMessages.CommonFailMessage, "JsonResult.Data", expectedData, actualData);
-
-        //    ActionResult result = new JsonResult { Data = actualData };
-
-        //    System.Action act = () => result.Should().BeJsonResult().WithData(expectedData);
-
-        //    act.Should().Throw<Exception>().WithMessage(expectedMessage);
-        //}
-
         #endregion
 
-#if !NETCOREAPP1_0
         [Test]
         public void WithContentEncoding_GivenExpected_ShouldPass()
         {
@@ -169,7 +139,6 @@ public void WithContentEncoding_GivenUnexpected_ShouldFail()
             a.Should().Throw<Exception>()
                 .WithMessage(failureMessage);
         }
-#endif
 
         private class ObjectWithEquality : IEquatable<ObjectWithEquality>
         {