Ported Controllers.Views.ActionResults.Test package (#326)

ivaylokenov · ivaylokenov · commit 299284bb208c · 2019-08-25T16:50:16.000+03:00
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/BuildersTests/ActionResultsTests/JsonTests/JsonTestBuilderTests.cs b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/BuildersTests/ActionResultsTests/JsonTests/JsonTestBuilderTests.cs
@@ -36,17 +36,14 @@ public void WithDefaultJsonSettingsShouldNotThrowExceptionAndPassAssertions()
         }
 
         [Fact]
-        public void WithDefaultJsonSettingsShouldThrowExceptionWithNull()
+        public void WithDefaultJsonSettingsShouldWorkCorrectlyWithNull()
         {
-            Assert.Throws<InvocationAssertionException>(() =>
-            {
-                MyController<MvcController>
-                    .Instance()
-                    .Calling(c => c.JsonWithSpecificSettingsAction(null))
-                    .ShouldReturn()
-                    .Json(json => json
-                        .WithDefaultJsonSerializerSettings());
-            });
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.JsonWithSpecificSettingsAction(null))
+                .ShouldReturn()
+                .Json(json => json
+                    .WithDefaultJsonSerializerSettings());
         }
 
         [Fact]
@@ -151,11 +148,11 @@ public void WithJsonSerializerSettingsShouldThrowExceptionWithActionSettings()
         }
 
         [Fact]
-        public void WithJsonSerializerSettingsShouldThrowExceptionWithNull()
+        public void WithJsonSerializerSettingsShouldThrowWithNull()
         {
             var jsonSettings = TestObjectFactory.GetJsonSerializerSettings();
 
-            Assert.Throws<InvocationAssertionException>(() =>
+            Assert.Throws<JsonResultAssertionException>(() =>
             {
                 MyController<MvcController>
                     .Instance()
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>MyTested.AspNetCore.Mvc.Test</AssemblyName>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/Properties/AssemblyInfo.cs b/test/MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test/Properties/AssemblyInfo.cs
@@ -1,7 +1,10 @@
 ﻿using System.Reflection;
 using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Xunit;
 
+[assembly: ApplicationPart("MyTested.AspNetCore.Mvc.Test.Setups")]
+
 [assembly: AssemblyProduct("MyTested.AspNetCore.Mvc.Controllers.Views.ActionResults.Test")]
 [assembly: ComVisible(false)]
 
diff --git a/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/Properties/AssemblyInfo.cs b/test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/Properties/AssemblyInfo.cs
@@ -1,7 +1,10 @@
 ﻿using System.Reflection;
 using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Xunit;
 
+[assembly: ApplicationPart("MyTested.AspNetCore.Mvc.Test.Setups")]
+
 [assembly: AssemblyProduct("MyTested.AspNetCore.Mvc.ViewActionResults.Test")]
 [assembly: ComVisible(false)]
 

Original file line number	Diff line number	Diff line change
`@@ -36,17 +36,14 @@ public void WithDefaultJsonSettingsShouldNotThrowExceptionAndPassAssertions()`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`[Fact]`
`39`		`- public void WithDefaultJsonSettingsShouldThrowExceptionWithNull()`
	`39`	`+ public void WithDefaultJsonSettingsShouldWorkCorrectlyWithNull()`
`40`	`40`	`{`
`41`		`- Assert.Throws<InvocationAssertionException>(() =>`
`42`		`- {`
`43`		`- MyController<MvcController>`
`44`		`- .Instance()`
`45`		`- .Calling(c => c.JsonWithSpecificSettingsAction(null))`
`46`		`- .ShouldReturn()`
`47`		`- .Json(json => json`
`48`		`- .WithDefaultJsonSerializerSettings());`
`49`		`- });`
	`41`	`+ MyController<MvcController>`
	`42`	`+ .Instance()`
	`43`	`+ .Calling(c => c.JsonWithSpecificSettingsAction(null))`
	`44`	`+ .ShouldReturn()`
	`45`	`+ .Json(json => json`
	`46`	`+ .WithDefaultJsonSerializerSettings());`
`50`	`47`	`}`
`51`	`48`
`52`	`49`	`[Fact]`
`@@ -151,11 +148,11 @@ public void WithJsonSerializerSettingsShouldThrowExceptionWithActionSettings()`
`151`	`148`	`}`
`152`	`149`
`153`	`150`	`[Fact]`
`154`		`- public void WithJsonSerializerSettingsShouldThrowExceptionWithNull()`
	`151`	`+ public void WithJsonSerializerSettingsShouldThrowWithNull()`
`155`	`152`	`{`
`156`	`153`	`var jsonSettings = TestObjectFactory.GetJsonSerializerSettings();`
`157`	`154`
`158`		`- Assert.Throws<InvocationAssertionException>(() =>`
	`155`	`+ Assert.Throws<JsonResultAssertionException>(() =>`
`159`	`156`	`{`
`160`	`157`	`MyController<MvcController>`
`161`	`158`	`.Instance()`