Merge pull request #1485 from nunit/issue-1478

Upgrade all tests to use latest version of NUnit available for each runtime.

Author: CharliePoole

NetFXTests.nunit

@@ -1,11 +1,11 @@
 <NUnitProject>
   <Settings processModel="Default" domainUsage="Default" />
   <Config name="Debug" appbase="bin/Debug">
-      <assembly path="net462/mock-assembly.dll" />
-      <assembly path="net6.0/mock-assembly.dll" />
+      <assembly path="testdata/net462/mock-assembly.dll" />
+      <assembly path="testdata/net6.0/mock-assembly.dll" />
   </Config>
   <Config name="Release" appbase="bin/Release">
-      <assembly path="net462/mock-assembly.dll" />
-      <assembly path="net6.0/mock-assembly.dll" />
+      <assembly path="testdata/net462/mock-assembly.dll" />
+      <assembly path="testdata/net6.0/mock-assembly.dll" />
   </Config>
 </NUnitProject>

package-tests.cake

@@ -35,31 +35,31 @@ class MockAssemblyExpectedResult : ExpectedResult
 StandardRunnerTests.Add(new PackageTest(
     1, "Net462Test",
     "Run mock-assembly.dll under .NET 4.6.2",
-    "net462/mock-assembly.dll",
+    "testdata/net462/mock-assembly.dll",
     new MockAssemblyExpectedResult("net-4.6.2")));
 
 AddToBothLists(new PackageTest(
     1, "Net80Test",
     "Run mock-assembly.dll under .NET 8.0",
-    "net8.0/mock-assembly.dll",
+    "testdata/net8.0/mock-assembly.dll",
     new MockAssemblyExpectedResult("netcore-8.0")));
 
 AddToBothLists(new PackageTest(
     1, "Net70Test",
     "Run mock-assembly.dll under .NET 7.0",
-    "net7.0/mock-assembly.dll",
+    "testdata/net7.0/mock-assembly.dll",
     new MockAssemblyExpectedResult("netcore-7.0")));
 
 AddToBothLists(new PackageTest(
     1, "Net60Test",
     "Run mock-assembly.dll under .NET 6.0",
-    "net6.0/mock-assembly.dll",
+    "testdata/net6.0/mock-assembly.dll",
     new MockAssemblyExpectedResult("netcore-6.0")));
 
 AddToBothLists(new PackageTest(
     1, "NetCore31Test",
     "Run mock-assembly.dll under .NET Core 3.1",
-    "netcoreapp3.1/mock-assembly.dll",
+    "testdata/netcoreapp3.1/mock-assembly.dll",
     new MockAssemblyExpectedResult("netcore-3.1")));
 
 //////////////////////////////////////////////////////////////////////
@@ -83,7 +83,7 @@ class MockAssemblyX86ExpectedResult : MockAssemblyExpectedResult
 StandardRunnerTests.Add(new PackageTest(
     1, "Net462X86Test",
     "Run mock-assembly-x86.dll under .NET 4.6.2",
-    "net462/mock-assembly-x86.dll",
+    "testdata/net462/mock-assembly-x86.dll",
     new MockAssemblyX86ExpectedResult("net-4.6.2")));
 
 if (dotnetX86Available)
@@ -96,27 +96,27 @@ if (dotnetX86Available)
         StandardRunnerTests.Add(new PackageTest(
             1, "Net80X86Test",
             "Run mock-assembly-x86.dll under .NET 8.0",
-            "net8.0/mock-assembly-x86.dll",
+            "testdata/net8.0/mock-assembly-x86.dll",
             new MockAssemblyX86ExpectedResult("netcore-8.0")));
 
     if (!onAppVeyor && !onGitHubActions)
         StandardRunnerTests.Add(new PackageTest(
             1, "Net70X86Test",
             "Run mock-assembly-x86.dll under .NET 7.0",
-            "net7.0/mock-assembly-x86.dll",
+            "testdata/net7.0/mock-assembly-x86.dll",
             new MockAssemblyX86ExpectedResult("netcore-7.0")));
 
     StandardRunnerTests.Add(new PackageTest(
         1, "Net60X86Test",
         "Run mock-assembly-x86.dll under .NET 6.0",
-        "net6.0/mock-assembly-x86.dll",
+        "testdata/net6.0/mock-assembly-x86.dll",
         new MockAssemblyX86ExpectedResult("netcore-6.0")));
 
     if (!onAppVeyor && !onGitHubActions)
         StandardRunnerTests.Add(new PackageTest(
             1, "NetCore31X86Test",
             "Run mock-assembly-x86.dll under .NET Core 3.1",
-            "netcoreapp3.1/mock-assembly-x86.dll",
+            "testdata/netcoreapp3.1/mock-assembly-x86.dll",
             new MockAssemblyX86ExpectedResult("netcore-3.1")));
 }
 
@@ -127,19 +127,19 @@ if (dotnetX86Available)
 StandardRunnerTests.Add(new PackageTest(
     1, "Net462PlusNet462Test",
     "Run two copies of mock-assembly together",
-    "net462/mock-assembly.dll net462/mock-assembly.dll",
+    "testdata/net462/mock-assembly.dll testdata/net462/mock-assembly.dll",
     new MockAssemblyExpectedResult("net-4.6.2", "net-4.6.2")));
 
 StandardRunnerTests.Add(new PackageTest(
     1, "Net60PlusNet80Test",
     "Run mock-assembly under .NET6.0 and 8.0 together",
-    "net6.0/mock-assembly.dll net8.0/mock-assembly.dll",
+    "testdata/net6.0/mock-assembly.dll testdata/net8.0/mock-assembly.dll",
     new MockAssemblyExpectedResult("netcore-6.0", "netcore-8.0")));
 
 StandardRunnerTests.Add(new PackageTest(
     1, "Net462PlusNet60Test",
     "Run mock-assembly under .Net Framework 4.6.2 and .Net 6.0 together",
-    "net462/mock-assembly.dll net6.0/mock-assembly.dll",
+    "testdata/net462/mock-assembly.dll testdata/net6.0/mock-assembly.dll",
     new MockAssemblyExpectedResult("net-4.6.2", "netcore-6.0")));
 
 //////////////////////////////////////////////////////////////////////
@@ -148,15 +148,15 @@ StandardRunnerTests.Add(new PackageTest(
 
 StandardRunnerTests.Add(new PackageTest(
     1, "Net60AspNetCoreTest", "Run test using AspNetCore targeting .NET 6.0",
-    "net6.0/aspnetcore-test.dll", new ExpectedResult("Passed")
+    "testdata/net6.0/aspnetcore-test.dll", new ExpectedResult("Passed")
     {
         Total = 3, Passed = 3, Failed = 0, Warnings = 0, Inconclusive = 0, Skipped = 0,
         Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("aspnetcore-test.dll", "netcore-6.0") }
     }));
 
 StandardRunnerTests.Add(new PackageTest(
     1, "Net80AspNetCoreTest", "Run test using AspNetCore targeting .NET 8.0",
-    "net8.0/aspnetcore-test.dll", new ExpectedResult("Passed")
+    "testdata/net8.0/aspnetcore-test.dll", new ExpectedResult("Passed")
     {
         Total = 3, Passed = 3, Failed = 0, Warnings = 0, Inconclusive = 0, Skipped = 0,
         Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("aspnetcore-test.dll", "netcore-8.0") }
@@ -168,15 +168,15 @@ StandardRunnerTests.Add(new PackageTest(
 
 StandardRunnerTests.Add(new PackageTest(
     1, "Net60WindowsFormsTest", "Run test using windows forms under .NET 6.0",
-    "net6.0-windows/windows-forms-test.dll", new ExpectedResult("Passed")
+    "testdata/net6.0-windows/windows-forms-test.dll", new ExpectedResult("Passed")
     {
         Total = 2, Passed = 2, Failed = 0, Warnings = 0, Inconclusive = 0, Skipped = 0,
         Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("windows-forms-test.dll", "netcore-6.0") }
     }));
 
 StandardRunnerTests.Add(new PackageTest(
     1, "Net80WindowsFormsTest", "Run test using windows forms under .NET 8.0",
-    "net8.0-windows/windows-forms-test.dll", new ExpectedResult("Passed")
+    "testdata/net8.0-windows/windows-forms-test.dll", new ExpectedResult("Passed")
     {
         Total = 2, Passed = 2, Failed = 0, Warnings = 0, Inconclusive = 0, Skipped = 0,
         Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("windows-forms-test.dll", "netcore-8.0") }
@@ -188,12 +188,12 @@ StandardRunnerTests.Add(new PackageTest(
 
 StandardRunnerTests.Add(new PackageTest(
     1, "Net60WPFTest", "Run test using WPF under .NET 6.0",
-    "net6.0-windows/WpfTest.dll --trace=Debug", 
+    "testdata/net6.0-windows/WpfTest.dll --trace=Debug", 
     new ExpectedResult("Passed") { Assemblies = new[] { new ExpectedAssemblyResult("WpfTest.dll", "netcore-6.0") } }));
 
 StandardRunnerTests.Add(new PackageTest(
     1, "Net80WPFTest", "Run test using WPF under .NET 8.0",
-    "net8.0-windows/WpfTest.dll --trace=Debug",
+    "testdata/net8.0-windows/WpfTest.dll --trace=Debug",
     new ExpectedResult("Passed") { Assemblies = new[] { new ExpectedAssemblyResult("WpfTest.dll", "netcore-8.0") } }));
 
 //////////////////////////////////////////////////////////////////////
@@ -210,7 +210,7 @@ StandardRunnerTests.Add(new PackageTest(
 StandardRunnerTests.Add(new PackageTest(
     1, "V2ResultWriterTest",
     "Run mock-assembly under .NET 6.0 and produce V2 output",
-    "net6.0/mock-assembly.dll --result=TestResult.xml --result=NUnit2TestResult.xml;format=nunit2",
+    "testdata/net6.0/mock-assembly.dll --result=TestResult.xml --result=NUnit2TestResult.xml;format=nunit2",
     new MockAssemblyExpectedResult("netcore-6.0"),
     KnownExtensions.NUnitV2ResultWriter.SetVersion("3.8.0")));
 
@@ -255,7 +255,7 @@ StandardRunnerTests.Add(new PackageTest(
 StandardRunnerTests.Add(new PackageTest(
     1, "InvalidTestNameTest_Net462",
     "Ensure we handle invalid test names correctly under .NET 4.6.2",
-    "net462/InvalidTestNames.dll --trace:Debug",
+    "testdata/net462/InvalidTestNames.dll --trace:Debug",
     new ExpectedResult("Passed")
     {
         Assemblies = new ExpectedAssemblyResult[]
@@ -267,7 +267,7 @@ StandardRunnerTests.Add(new PackageTest(
 AddToBothLists(new PackageTest(
     1, "InvalidTestNameTest_Net60",
     "Ensure we handle invalid test names correctly under .NET 6.0",
-    "net6.0/InvalidTestNames.dll --trace:Debug",
+    "testdata/net6.0/InvalidTestNames.dll --trace:Debug",
     new ExpectedResult("Passed")
     {
         Assemblies = new ExpectedAssemblyResult[]
@@ -279,7 +279,7 @@ AddToBothLists(new PackageTest(
 AddToBothLists(new PackageTest(
     1, "InvalidTestNameTest_Net80",
     "Ensure we handle invalid test names correctly under .NET 8.0",
-    "net8.0/InvalidTestNames.dll --trace:Debug",
+    "testdata/net8.0/InvalidTestNames.dll --trace:Debug",
     new ExpectedResult("Passed")
     {
         Assemblies = new ExpectedAssemblyResult[]

src/NUnitConsole/nunit3-console.tests/CommandLineTests.cs

@@ -99,7 +99,7 @@ public void GetArgsFromFiles(string commandline, string files, params string[] e
 
             // Then
             Assert.That(expandedArgs, Is.EqualTo(expectedArgs));
-            Assert.IsEmpty(options.ErrorMessages);
+            Assert.That(options.ErrorMessages, Is.Empty);
         }
 
         [TestCase("--arg1 @file1.txt --arg2", "The file \"file1.txt\" was not found.")]
@@ -406,7 +406,7 @@ public void ResultOptionWithFilePath()
             var spec = options.ResultOutputSpecifications[0];
             Assert.That(spec.OutputPath, Is.EqualTo("results.xml"));
             Assert.That(spec.Format, Is.EqualTo("nunit3"));
-            Assert.Null(spec.Transform);
+            Assert.That(spec.Transform, Is.Null);
         }
 
         [Test]
@@ -420,7 +420,7 @@ public void ResultOptionWithFilePathAndFormat()
             var spec = options.ResultOutputSpecifications[0];
             Assert.That(spec.OutputPath, Is.EqualTo("results.xml"));
             Assert.That(spec.Format, Is.EqualTo("nunit2"));
-            Assert.Null(spec.Transform);
+            Assert.That(spec.Transform, Is.Null);
         }
 
         [Test]
@@ -479,12 +479,12 @@ public void ResultOptionMayBeRepeated()
             var spec1 = specs[0];
             Assert.That(spec1.OutputPath, Is.EqualTo("results.xml"));
             Assert.That(spec1.Format, Is.EqualTo("nunit3"));
-            Assert.Null(spec1.Transform);
+            Assert.That(spec1.Transform, Is.Null);
 
             var spec2 = specs[1];
             Assert.That(spec2.OutputPath, Is.EqualTo("nunit2results.xml"));
             Assert.That(spec2.Format, Is.EqualTo("nunit2"));
-            Assert.Null(spec2.Transform);
+            Assert.That(spec2.Transform, Is.Null);
 
             var spec3 = specs[2];
             Assert.That(spec3.OutputPath, Is.EqualTo("myresult.xml"));
@@ -502,7 +502,7 @@ public void DefaultResultSpecification()
             var spec = options.ResultOutputSpecifications[0];
             Assert.That(spec.OutputPath, Is.EqualTo("TestResult.xml"));
             Assert.That(spec.Format, Is.EqualTo("nunit3"));
-            Assert.Null(spec.Transform);
+            Assert.That(spec.Transform, Is.Null);
         }
 
         [Test]
@@ -562,7 +562,7 @@ public void ExploreOptionWithFilePath()
             var spec = options.ExploreOutputSpecifications[0];
             Assert.That(spec.OutputPath, Is.EqualTo("results.xml"));
             Assert.That(spec.Format, Is.EqualTo("nunit3"));
-            Assert.Null(spec.Transform);
+            Assert.That(spec.Transform, Is.Null);
         }
 
         [Test]
@@ -577,7 +577,7 @@ public void ExploreOptionWithFilePathAndFormat()
             var spec = options.ExploreOutputSpecifications[0];
             Assert.That(spec.OutputPath, Is.EqualTo("results.xml"));
             Assert.That(spec.Format, Is.EqualTo("cases"));
-            Assert.Null(spec.Transform);
+            Assert.That(spec.Transform, Is.Null);
         }
 
         [Test]
@@ -869,14 +869,14 @@ private static IFileSystem GetFileSystemContainingFile(string fileName)
         private static FieldInfo GetFieldInfo(string fieldName)
         {
             FieldInfo field = typeof(ConsoleOptions).GetField(fieldName);
-            Assert.IsNotNull(field, "The field '{0}' is not defined", fieldName);
+            Assert.That(field, Is.Not.Null, "The field '{0}' is not defined", fieldName);
             return field;
         }
 
         private static PropertyInfo GetPropertyInfo(string propertyName)
         {
             PropertyInfo property = typeof(ConsoleOptions).GetProperty(propertyName);
-            Assert.IsNotNull(property, "The property '{0}' is not defined", propertyName);
+            Assert.That(property, Is.Not.Null, "The property '{0}' is not defined", propertyName);
             return property;
         }
 

src/NUnitConsole/nunit3-console.tests/OutputSpecificationTests.cs

@@ -40,7 +40,7 @@ public void FileNameOnly()
             var spec = new Spec("MyFile.xml", null);
             Assert.That(spec.OutputPath, Is.EqualTo("MyFile.xml"));
             Assert.That(spec.Format, Is.EqualTo("nunit3"));
-            Assert.Null(spec.Transform);
+            Assert.That(spec.Transform, Is.Null);
         }
 
         [Test]
@@ -49,7 +49,7 @@ public void FileNamePlusFormat()
             var spec = new Spec("MyFile.xml;format=nunit2", null);
             Assert.That(spec.OutputPath, Is.EqualTo("MyFile.xml"));
             Assert.That(spec.Format, Is.EqualTo("nunit2"));
-            Assert.Null(spec.Transform);
+            Assert.That(spec.Transform, Is.Null);
         }
 
         [Test]

src/NUnitConsole/nunit3-console.tests/ResultReporterTests.cs

@@ -42,7 +42,7 @@ public void CreateResult()
             var engineResult = AddMetadata(new TestEngineResult(xmlText));
             _result = engineResult.Xml;
 
-            Assert.NotNull(_result, "Unable to create report result.");
+            Assert.That(_result, Is.Not.Null, "Unable to create report result.");
         }
 
         [SetUp]

src/NUnitConsole/nunit3-console.tests/nunit3-console.tests.csproj

@@ -16,9 +16,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NSubstitute" Version="2.0.3" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnitLite" Version="3.13.3" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnitLite" Version="4.2.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'!='net462'">