Merge pull request #1135 from nunit/nunit4-support

Nunit4 support

Author: CharliePoole

GitVersion.yml

@@ -1,4 +1,4 @@
-next-version: 3.14.0
+next-version: 4.0.0
 mode: ContinuousDelivery
 legacy-semver-padding: 5
 build-metadata-padding: 5

src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnit3DriverFactoryTests.cs

@@ -0,0 +1,44 @@
+// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
+
+using NUnit.Engine.Drivers;
+using NUnit.Framework;
+using System;
+using System.Reflection;
+
+namespace NUnit.Engine.Tests.Drivers
+{
+    public class NUnit3DriverFactoryTests
+    {
+        private NUnit3DriverFactory _factory;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _factory = new NUnit3DriverFactory();
+        }
+
+        [TestCase(2, ExpectedResult = false)]
+        [TestCase(3, ExpectedResult = true)]
+        [TestCase(4, ExpectedResult = true)]
+        public bool SupportsNetFramework(int majorVersion)
+        {
+            AssemblyName name = new AssemblyName(NUnit3DriverFactory.NUNIT_FRAMEWORK)
+            {
+                Version = new Version(majorVersion, 0)
+            };
+
+            return _factory.IsSupportedTestFramework(name);
+        }
+
+        [Test]
+        public void DoesNotSupportOtherFrameworks()
+        {
+            AssemblyName name = new AssemblyName("VSTest.dll")
+            {
+                Version = new Version(3, 0)
+            };
+
+            Assert.That(_factory.IsSupportedTestFramework(name), Is.False);
+        }
+    }
+}

src/NUnitEngine/nunit.engine.core/Drivers/NUnit3DriverFactory.cs

@@ -10,7 +10,7 @@ namespace NUnit.Engine.Drivers
 {
     public class NUnit3DriverFactory : IDriverFactory
     {
-        private const string NUNIT_FRAMEWORK = "nunit.framework";
+        internal const string NUNIT_FRAMEWORK = "nunit.framework";
         static ILogger log = InternalTrace.GetLogger(typeof(NUnit3DriverFactory));
 
         /// <summary>
@@ -20,7 +20,7 @@ public class NUnit3DriverFactory : IDriverFactory
         /// <param name="reference">An AssemblyName referring to the possible test framework.</param>
         public bool IsSupportedTestFramework(AssemblyName reference)
         {
-            return NUNIT_FRAMEWORK.Equals(reference.Name, StringComparison.OrdinalIgnoreCase) && reference.Version.Major == 3;
+            return NUNIT_FRAMEWORK.Equals(reference.Name, StringComparison.OrdinalIgnoreCase) && reference.Version.Major >= 3;
         }
 
 #if NETFRAMEWORK