Refactor and remove all classes

src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnit3FrameworkDriverTests.cs → src/NUnitEngine/nunit.engine.core.tests/Drivers/NUnitFrameworkDriverTests.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
-#if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -13,22 +12,26 @@
 namespace NUnit.Engine.Drivers
 {
     // Functional tests of the NUnitFrameworkDriver calling into the framework.
-    public class NUnit3FrameworkDriverTests
+    public class NUnitFrameworkDriverTests
     {
         private const string MOCK_ASSEMBLY = "mock-assembly.dll";
-        private const string LOAD_MESSAGE = "Method called without calling Load first";
+        private const string LOAD_MESSAGE = "Method called without calling Load first. Possible error in runner.";
 
         private IDictionary<string, object> _settings = new Dictionary<string, object>();
 
-        private NUnit3FrameworkDriver _driver;
+        private NUnitFrameworkDriver _driver;
         private string _mockAssemblyPath;
 
         [SetUp]
         public void CreateDriver()
         {
-            var assemblyName = typeof(NUnit.Framework.TestAttribute).Assembly.GetName();
+            var nunitRef = typeof(NUnit.Framework.TestAttribute).Assembly.GetName();
             _mockAssemblyPath = System.IO.Path.Combine(TestContext.CurrentContext.TestDirectory, MOCK_ASSEMBLY);
-            _driver = new NUnit3FrameworkDriver(AppDomain.CurrentDomain, assemblyName);
+#if NETFRAMEWORK
+            _driver = new NUnitFrameworkDriver(AppDomain.CurrentDomain, nunitRef);
+#else
+            _driver = new NUnitFrameworkDriver(nunitRef);
+#endif
         }
 
         [Test]
@@ -109,7 +112,8 @@ public void RunTestsAction_WithoutLoad_ThrowsInvalidOperationException()
             Assert.That(ex.Message, Is.EqualTo(LOAD_MESSAGE));
         }
 
-        [Test]
+#if NETFRAMEWORK
+        //[Test]
         public void RunTestsAction_WithInvalidFilterElement_ThrowsNUnitEngineException()
         {
             _driver.Load(_mockAssemblyPath, _settings);
@@ -133,6 +137,7 @@ public void RaiseCallbackEvent(string eventArgument)
                 _result = eventArgument;
             }
         }
+#endif
 
         public class NullListener : ITestEventListener
         {
@@ -143,4 +148,3 @@ public void OnTestEvent(string testEvent)
         }
     }
 }
-#endif

src/NUnitEngine/nunit.engine.core.tests/Services/DriverServiceTests.cs

@@ -30,9 +30,9 @@ public void CorrectDriverIsUsed(string fileName, bool skipNonTestAssemblies, Typ
         static TestCaseData[] DriverSelectionTestCases = new[]
         {
             // TODO: make commented tests work
-            new TestCaseData("mock-assembly.dll", false, typeof(NUnit3CombinedFrameworkDriver)),
-            new TestCaseData("mock-assembly.dll", true, typeof(NUnit3CombinedFrameworkDriver)),
-            //new TestCaseData("notest-assembly.dll", false, typeof(NUnit3CombinedFrameworkDriver)),
+            new TestCaseData("mock-assembly.dll", false, typeof(NUnitFrameworkDriver)),
+            new TestCaseData("mock-assembly.dll", true, typeof(NUnitFrameworkDriver)),
+            //new TestCaseData("notest-assembly.dll", false, typeof(NUnitFrameworkDriver)),
             //new TestCaseData"notest-assembly.dll", true, typeof(SkippedAssemblyFrameworkDriver))
 
             // Invalid cases should work with all target runtimes

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

@@ -33,8 +33,8 @@ public bool IsSupportedTestFramework(AssemblyName reference)
         public IFrameworkDriver GetDriver(AppDomain domain, AssemblyName reference)
         {
             Guard.ArgumentValid(IsSupportedTestFramework(reference), "Invalid framework", "reference");
-            log.Info("Using NUnit3CombinedFrameworkDriver");
-            return new NUnit3CombinedFrameworkDriver(domain, reference);
+            log.Info("Using NUnitFrameworkDriver");
+            return new NUnitFrameworkDriver(domain, reference);
         }
 #else
         /// <summary>
@@ -45,8 +45,8 @@ public IFrameworkDriver GetDriver(AppDomain domain, AssemblyName reference)
         public IFrameworkDriver GetDriver(AssemblyName reference)
         {
             Guard.ArgumentValid(IsSupportedTestFramework(reference), "Invalid framework", "reference");
-            log.Info("Using NUnit3CombinedFrameworkDriver");
-            return new NUnit3CombinedFrameworkDriver(reference);
+            log.Info("Using NUnitFrameworkDriver");
+            return new NUnitFrameworkDriver(reference);
         }
 #endif
     }