Migrated to nunit 4 and updated tests / csproj files

MindscapeHQ · Feb 8, 2024 · 6743b4f · 6743b4f
1 parent d6b31a8
commit 6743b4f
Show file tree

Hide file tree

Showing 35 changed files with 572 additions and 560 deletions.
diff --git a/Mindscape.Raygun4Net.AspNetCore.Tests/Mindscape.Raygun4Net.AspNetCore.Tests.csproj b/Mindscape.Raygun4Net.AspNetCore.Tests/Mindscape.Raygun4Net.AspNetCore.Tests.csproj
@@ -14,4 +14,12 @@
     <ProjectReference Include="..\Mindscape.Raygun4Net.AspNetCore.Tests.TestLib\Mindscape.Raygun4Net.AspNetCore.Tests.TestLib.csproj" />
     <ProjectReference Include="..\Mindscape.Raygun4Net.AspNetCore\Mindscape.Raygun4Net.AspNetCore.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+  </ItemGroup>
 </Project>
diff --git a/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj b/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj
@@ -27,13 +27,7 @@
     <None Include="..\128x128-transparent.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />

diff --git a/Mindscape.Raygun4Net.Mvc.Tests/Mindscape.Raygun4Net.Mvc.Tests.csproj b/Mindscape.Raygun4Net.Mvc.Tests/Mindscape.Raygun4Net.Mvc.Tests.csproj
@@ -1,48 +1,50 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
     <OutputType>Library</OutputType>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Raygun.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+
   <ItemGroup>
     <Reference Include="System.configuration" />
     <Reference Include="System.Web" />
   </ItemGroup>
+
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="3.0.20105.1" />
+    <PackageReference Include="Microsoft.AspNet.Razor" Version="1.0.20105.408" />
+    <PackageReference Include="Microsoft.AspNet.WebPages" Version="1.0.20105.408" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3" />
+    <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Mindscape.Raygun4Net.Core\Mindscape.Raygun4Net.Core.csproj" />
     <ProjectReference Include="..\Mindscape.Raygun4Net.Mvc\Mindscape.Raygun4Net.Mvc.csproj" />
     <ProjectReference Include="..\Mindscape.Raygun4Net4\Mindscape.Raygun4Net4.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Payloads\" />
   </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="Payloads\BasicWithValues.xml" />
     <EmbeddedResource Include="Payloads\AttributedWithValues.xml" />
     <EmbeddedResource Include="Payloads\BasicWithoutValues.xml" />
     <EmbeddedResource Include="Payloads\AttributedWithoutValues.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNet.Mvc" Version="3.0.20105.1" />
-    <PackageReference Include="Microsoft.AspNet.Razor" Version="1.0.20105.408" />
-    <PackageReference Include="Microsoft.AspNet.WebPages" Version="1.0.20105.408" />
-    <PackageReference Include="Microsoft.CodeCoverage" Version="17.7.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3" />
-    <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-  </ItemGroup>
 </Project>
diff --git a/Mindscape.Raygun4Net.Mvc.Tests/RaygunClientTests.cs b/Mindscape.Raygun4Net.Mvc.Tests/RaygunClientTests.cs
@@ -29,8 +29,8 @@ public void StripTargetInvocationExceptionByDefault()
       TargetInvocationException wrapper = new TargetInvocationException(_exception);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(1, exceptions.Count);
-      Assert.Contains(_exception, exceptions);
+      Assert.That(1, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(_exception));
     }
 
     [Test]
@@ -39,8 +39,8 @@ public void StripHttpUnhandledExceptionByDefault()
       HttpUnhandledException wrapper = new HttpUnhandledException("Something went wrong", _exception);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(1, exceptions.Count);
-      Assert.Contains(_exception, exceptions);
+      Assert.That(1, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(_exception));
     }
 
     [Test]
@@ -51,8 +51,8 @@ public void StripSpecifiedWrapperException()
       WrapperException wrapper = new WrapperException(_exception);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(1, exceptions.Count);
-      Assert.Contains(_exception, exceptions);
+      Assert.That(1, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(_exception));
     }
 
     [Test]
@@ -61,16 +61,16 @@ public void DontStripIfNoInnerException()
       HttpUnhandledException wrapper = new HttpUnhandledException();
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(1, exceptions.Count);
-      Assert.Contains(wrapper, exceptions);
+      Assert.That(1, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(wrapper));
     }
 
     [Test]
     public void DontStripNull()
     {
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(null).ToList();
-      Assert.AreEqual(1, exceptions.Count); // The current expected behaviour is that you can pass null to the Send methods and cause Raygun to send a report.
-      Assert.Contains(null, exceptions);
+      Assert.That(1, Is.EqualTo(exceptions.Count)); // The current expected behaviour is that you can pass null to the Send methods and cause Raygun to send a report.
+      Assert.That(exceptions, Contains.Item(null));
     }
 
     [Test]
@@ -80,8 +80,8 @@ public void StripMultipleWrapperExceptions()
       TargetInvocationException wrapper2 = new TargetInvocationException(wrapper);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper2).ToList();
-      Assert.AreEqual(1, exceptions.Count);
-      Assert.Contains(_exception, exceptions);
+      Assert.That(1, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(_exception));
     }
 
     [Test]
@@ -92,8 +92,8 @@ public void RemoveWrapperExceptions()
       TargetInvocationException wrapper = new TargetInvocationException(_exception);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(1, exceptions.Count);
-      Assert.Contains(wrapper, exceptions);
+      Assert.That(1, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(wrapper));
     }
 
     [Test]
@@ -105,9 +105,9 @@ public void StripAggregateException()
       AggregateException wrapper = new AggregateException(_exception, exception2);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(2, exceptions.Count);
-      Assert.Contains(_exception, exceptions);
-      Assert.Contains(exception2, exceptions);
+      Assert.That(2, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(_exception));
+      Assert.That(exceptions, Contains.Item(exception2));
     }
 
     [Test]
@@ -120,9 +120,9 @@ public void StripAggregateExceptionAndTargetInvocationException()
       AggregateException wrapper = new AggregateException(_exception, innerWrapper);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(2, exceptions.Count);
-      Assert.Contains(_exception, exceptions);
-      Assert.Contains(exception2, exceptions);
+      Assert.That(2, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(_exception));
+      Assert.That(exceptions, Contains.Item(exception2));
     }
 
     [Test]
@@ -135,9 +135,9 @@ public void StripTargetInvocationExceptionAndAggregateException()
       TargetInvocationException wrapper = new TargetInvocationException(innerWrapper);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(2, exceptions.Count);
-      Assert.Contains(_exception, exceptions);
-      Assert.Contains(exception2, exceptions);
+      Assert.That(2, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(_exception));
+      Assert.That(exceptions, Contains.Item(exception2));
     }
 
     [Test]
@@ -151,10 +151,10 @@ public void StripNestedAggregateExceptions()
       AggregateException wrapper = new AggregateException(innerWrapper, exception3);
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(3, exceptions.Count);
-      Assert.Contains(_exception, exceptions);
-      Assert.Contains(exception2, exceptions);
-      Assert.Contains(exception3, exceptions);
+      Assert.That(3, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(_exception));
+      Assert.That(exceptions, Contains.Item(exception2));
+      Assert.That(exceptions, Contains.Item(exception3));
     }
 
     [Test]
@@ -167,12 +167,12 @@ public void StripReflectionTypeLoadException()
       ReflectionTypeLoadException wrapper = new ReflectionTypeLoadException(new Type[] { typeof(FakeRaygunClient), typeof(WrapperException) }, new Exception[] { ex1, ex2 });
 
       List<Exception> exceptions = _client.ExposeStripWrapperExceptions(wrapper).ToList();
-      Assert.AreEqual(2, exceptions.Count);
-      Assert.Contains(ex1, exceptions);
-      Assert.Contains(ex2, exceptions);
+      Assert.That(2, Is.EqualTo(exceptions.Count));
+      Assert.That(exceptions, Contains.Item(ex1));
+      Assert.That(exceptions, Contains.Item(ex2));
 
-      Assert.IsTrue(ex1.Data["Type"].ToString().Contains("FakeRaygunClient"));
-      Assert.IsTrue(ex2.Data["Type"].ToString().Contains("WrapperException"));
+      Assert.That(ex1.Data["Type"].ToString().Contains("FakeRaygunClient"), Is.True);
+      Assert.That(ex2.Data["Type"].ToString().Contains("WrapperException"), Is.True);
     }
   }
 }
diff --git a/Mindscape.Raygun4Net.Mvc.Tests/RaygunHttpModuleTests.cs b/Mindscape.Raygun4Net.Mvc.Tests/RaygunHttpModuleTests.cs
@@ -27,8 +27,8 @@ public void TearDown()
     [Test]
     public void CanSend()
     {
-      Assert.IsTrue(_module.ExposeCanSend(new NullReferenceException()));
-      Assert.IsTrue(_module.ExposeCanSend(new HttpException(404, "Not Found")));
+      Assert.That(_module.ExposeCanSend(new NullReferenceException()), Is.True);
+      Assert.That(_module.ExposeCanSend(new HttpException(404, "Not Found")), Is.True);
     }
 
     [Test]
@@ -37,7 +37,7 @@ public void CanSend_ExcludeStatusCodeButNotHttpException()
       RaygunSettings.Settings.ExcludeHttpStatusCodesList = "404";
       _module.Init(new System.Web.HttpApplication());
 
-      Assert.IsTrue(_module.ExposeCanSend(new InvalidOperationException()));
+      Assert.That(_module.ExposeCanSend(new InvalidOperationException()), Is.True);
     }
 
     [Test]
@@ -46,7 +46,7 @@ public void CanSend_ExcludeDifferentStatusCode()
       RaygunSettings.Settings.ExcludeHttpStatusCodesList = "404";
       _module.Init(new System.Web.HttpApplication());
 
-      Assert.IsTrue(_module.ExposeCanSend(new HttpException(500, "Error message")));
+      Assert.That(_module.ExposeCanSend(new HttpException(500, "Error message")), Is.True);
     }
 
     [Test]
@@ -55,21 +55,21 @@ public void CanNotSend_ExcludeStatusCode()
       RaygunSettings.Settings.ExcludeHttpStatusCodesList = "404";
       _module.Init(new System.Web.HttpApplication());
 
-      Assert.IsFalse(_module.ExposeCanSend(new HttpException(404, "Not Found")));
+      Assert.That(_module.ExposeCanSend(new HttpException(404, "Not Found")), Is.False);
     }
 
     // GetRaygunClient tests
 
     [Test]
     public void GetRaygunClient()
     {
-      Assert.IsNull(_module.ExposeGetRaygunClient(new HttpApplication()).User);
+      Assert.That(_module.ExposeGetRaygunClient(new HttpApplication()).User, Is.Null);
     }
 
     [Test]
     public void GetCustomizedRaygunClient()
     {
-      Assert.AreEqual("TestUser", _module.ExposeGetRaygunClient(new FakeHttpApplication()).User); // As set in FakeHttpApplication
+      Assert.That("TestUser", Is.EqualTo(_module.ExposeGetRaygunClient(new FakeHttpApplication()).User)); // As set in FakeHttpApplication
     }
 
     // Global filter tests
@@ -78,65 +78,65 @@ public void GetCustomizedRaygunClient()
     public void AddRaygunFilterIfHandleErrorAttributeIsPresent()
     {
       GlobalFilters.Filters.Add(new HandleErrorAttribute());
-      Assert.AreEqual(1, GlobalFilters.Filters.Count);
-      Assert.IsFalse(HasRaygunFilter);
+      Assert.That(1, Is.EqualTo(GlobalFilters.Filters.Count));
+      Assert.That(HasRaygunFilter, Is.False);
 
       _module.Init(new System.Web.HttpApplication());
 
-      Assert.IsTrue(HasRaygunFilter);
-      Assert.AreEqual(2, GlobalFilters.Filters.Count);
+      Assert.That(HasRaygunFilter, Is.True);
+      Assert.That(2, Is.EqualTo(GlobalFilters.Filters.Count));
     }
 
     [Test]
     public void DoNotAddRaygunFilterIfNoFiltersPresent()
     {
-      Assert.AreEqual(0, GlobalFilters.Filters.Count);
+      Assert.That(0, Is.EqualTo(GlobalFilters.Filters.Count));
 
       _module.Init(new System.Web.HttpApplication());
 
-      Assert.IsFalse(HasRaygunFilter);
-      Assert.AreEqual(0, GlobalFilters.Filters.Count);
+      Assert.That(HasRaygunFilter, Is.False);
+      Assert.That(0, Is.EqualTo(GlobalFilters.Filters.Count));
     }
 
     [Test]
     public void CanAddRaygunFilterIfMoreThanHandleErrorAttributeIsPresent()
     {
       GlobalFilters.Filters.Add(new HandleErrorAttribute());
       GlobalFilters.Filters.Add(new FakeFilterAttribute());
-      Assert.AreEqual(2, GlobalFilters.Filters.Count);
-      Assert.IsFalse(HasRaygunFilter);
+      Assert.That(2, Is.EqualTo(GlobalFilters.Filters.Count));
+      Assert.That(HasRaygunFilter, Is.False);
 
       _module.Init(new System.Web.HttpApplication());
 
-      Assert.IsTrue(HasRaygunFilter);
-      Assert.AreEqual(3, GlobalFilters.Filters.Count);
+      Assert.That(HasRaygunFilter, Is.True);
+      Assert.That(3, Is.EqualTo(GlobalFilters.Filters.Count));
     }
 
     [Test]
     public void DoNotAddRaygunFilterIfHandleErrorAttributeIsNotPresent()
     {
       GlobalFilters.Filters.Add(new FakeFilterAttribute());
-      Assert.AreEqual(1, GlobalFilters.Filters.Count);
-      Assert.IsFalse(HasRaygunFilter);
+      Assert.That(1, Is.EqualTo(GlobalFilters.Filters.Count));
+      Assert.That(HasRaygunFilter, Is.False);
 
       _module.Init(new System.Web.HttpApplication());
 
-      Assert.IsFalse(HasRaygunFilter);
-      Assert.AreEqual(1, GlobalFilters.Filters.Count);
+      Assert.That(HasRaygunFilter, Is.False);
+      Assert.That(1, Is.EqualTo(GlobalFilters.Filters.Count));
     }
 
     [Test]
     public void CanNotAddMultipleRaygunFilters()
     {
       GlobalFilters.Filters.Add(new HandleErrorAttribute());
-      Assert.AreEqual(1, GlobalFilters.Filters.Count);
-      Assert.IsFalse(HasRaygunFilter);
+      Assert.That(1, Is.EqualTo(GlobalFilters.Filters.Count));
+      Assert.That(HasRaygunFilter, Is.False);
 
       _module.Init(new System.Web.HttpApplication());
       _module.Init(new System.Web.HttpApplication());
 
-      Assert.IsTrue(HasRaygunFilter);
-      Assert.AreEqual(2, GlobalFilters.Filters.Count);
+      Assert.That(HasRaygunFilter, Is.True);
+      Assert.That(2, Is.EqualTo(GlobalFilters.Filters.Count));
     }
 
     private static bool HasRaygunFilter