Changes to allow for using NUnit.Engine 4 pre-release to support Net7…

… pre-release See https://github.com/nunit/nunit3-vs-adapter/pull/966/files and #965
nunit · Jun 26, 2022 · 7bb16ba · 7bb16ba
1 parent 6a6e422
commit 7bb16ba
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/build.cake b/build.cake
@@ -12,7 +12,7 @@ var configuration = Argument("configuration", "Release");
 // SET PACKAGE VERSION
 //////////////////////////////////////////////////////////////////////
 
-var version = "4.3.0";
+var version = "4.3.0-alpha-net7";
 var modifier = "";
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";

diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -12,6 +12,14 @@
     <SourceLinkCreate>true</SourceLinkCreate>
   </PropertyGroup>
 
+    <PropertyGroup>
+        <RestoreAdditionalProjectSource>https://www.myget.org/F/nunit/api/v3/index.json</RestoreAdditionalProjectSource>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="nunit.engine" Version="4.0.0-dev00100" />
+    </ItemGroup>
+
   <PropertyGroup>
     <PackageId>NUnit3TestAdapter</PackageId>
     <Authors>Charlie Poole, Terje Sandstrom</Authors>
@@ -24,7 +32,6 @@
 
   <ItemGroup>
     <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-    <PackageReference Include="nunit.engine" Version="3.15.0" />
     <PackageReference Include="TestCentric.Metadata" Version="1.7.1" Aliases="TestCentric" />
   </ItemGroup>
 

diff --git a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs
@@ -412,9 +412,9 @@ private NUnitDiscoveryTestAssembly ExtractTestAssembly(XElement node, NUnitDisco
         private static BaseProperties ExtractSuiteBasePropertiesClass(XElement node)
         {
             string dId = node.Attribute(NUnitXmlAttributeNames.Id).Value;
-            string dName = node.Attribute(NUnitXmlAttributeNames.Name).Value;
-            string dFullname = node.Attribute(NUnitXmlAttributeNames.Fullname).Value;
-            var dRunstate = ExtractRunState(node);
+            // test-run no longer has a name/fullname property
+            string dName = node.Attribute(NUnitXmlAttributeNames.Name)?.Value ?? "Unnamed";
+            string dFullname = node.Attribute(NUnitXmlAttributeNames.Fullname)?.Value ?? "Unnamed"; var dRunstate = ExtractRunState(node);
             const char apo = '\'';
             var tcs = node.Attribute(NUnitXmlAttributeNames.Testcasecount)?.Value.Trim(apo);
             int dTestcasecount = int.Parse(tcs ?? "1", CultureInfo.InvariantCulture);

diff --git a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs
@@ -1,6 +1,8 @@
 using System.Linq;
 using System.Xml;
+
 using NSubstitute;
+
 using NUnit.Framework;
 using NUnit.VisualStudio.TestAdapter.NUnitEngine;
 // ReSharper disable StringLiteralTypo
@@ -13,8 +15,8 @@ public class NUnitDiscoveryTests
         private IAdapterSettings settings;
 
         private const string FullDiscoveryXml =
-            @"<test-run id='2' name='CSharpTestDemo.dll' fullname='D:\repos\NUnit\nunit3-vs-adapter-demo\solutions\vs2017\CSharpTestDemo\bin\Debug\CSharpTestDemo.dll' testcasecount='108'>
-   <test-suite type='Assembly' id='0-1157' name='CSharpTestDemo.dll' fullname='D:\repos\NUnit\nunit3-vs-adapter-demo\solutions\vs2017\CSharpTestDemo\bin\Debug\CSharpTestDemo.dll' runstate='Runnable' testcasecount='108'>
+            @"<test-run id='2' testcasecount='108'>
+     <test-suite type='Assembly' id='0-1157' name='CSharpTestDemo.dll' fullname='D:\repos\NUnit\nunit3-vs-adapter-demo\solutions\vs2017\CSharpTestDemo\bin\Debug\CSharpTestDemo.dll' runstate='Runnable' testcasecount='108'>
       <properties>
          <property name='_PID' value='9856' />
          <property name='_APPDOMAIN' value='domain-807ad471-CSharpTestDemo.dll' />

diff --git a/src/NUnitTestAdapterTests/TestAdapterUtils.cs b/src/NUnitTestAdapterTests/TestAdapterUtils.cs
@@ -51,13 +51,9 @@ private static void InitializeForTesting(NUnitTestAdapter adapter)
             adapter.NUnitEngineAdapter.InternalEngineCreated += engine =>
             {
                 var concreteEngineType = (NUnit.Engine.TestEngine)engine;
-                concreteEngineType.Services.Add(new SettingsService(true));
                 concreteEngineType.Services.Add(new ExtensionService());
-                concreteEngineType.Services.Add(new DriverService());
-                concreteEngineType.Services.Add(new RecentFilesService());
                 concreteEngineType.Services.Add(new ProjectService());
                 concreteEngineType.Services.Add(new RuntimeFrameworkService());
-                concreteEngineType.Services.Add(new DefaultTestRunnerFactory());
                 concreteEngineType.Services.Add(new TestAgency()); // "TestAgency for " + TestContext.CurrentContext.Test.Name, 0));
                 concreteEngineType.Services.Add(new ResultService());
                 concreteEngineType.Services.Add(new TestFilterService());