Merge pull request #662 from TestCentric/issue-661

Disable running in process unless all assemblies are .NET Framework

src/Common/testcentric.common.tests/CommandLineTests.cs

@@ -82,7 +82,6 @@ public void ValidOptionsAreRecognized(string propertyName, string option, object
             Assert.That(property.GetValue(options, null), Is.EqualTo(expected));
         }
 
-        //[TestCase("--config")]
         [TestCase("--process")]
         [TestCase("--agents")]
         [TestCase("--domain")]
@@ -100,7 +99,6 @@ public void InvalidOptionsAreDetectedByMonoOptions(string option)
         [TestCase("--garbage")]
         [TestCase("--process:Unknown")]
         [TestCase("--agents:XYZ")]
-        [TestCase("--domain:Junk")]
         [TestCase("--trace:Something")]
         public void InvalidOptionsAreDetected(string option)
         {

src/Common/testcentric.common/TestPackageExtensions.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT License. See LICENSE.txt in root directory.
 // ***********************************************************************
 
-using System;
+using System.Runtime.Versioning;
 using System.Collections.Generic;
 using NUnit.Engine;
 
@@ -80,6 +80,18 @@ public static bool HasImageTargetFrameworkName(this TestPackage package)
             return HasSetting(package, EnginePackageSettings.ImageTargetFrameworkName);
         }
 
+        public static bool IsNetFrameworkPackage(this TestPackage package)
+        {
+            return !HasImageTargetFrameworkName(package) // Implies .NET 2.0 or lower
+                || new FrameworkName(GetImageTargetFrameworkName(package)).Identifier == ".NETFramework";
+        }
+
+        public static bool IsNetCorePackage(this TestPackage package)
+        {
+            return HasImageTargetFrameworkName(package)
+                && new FrameworkName(GetImageTargetFrameworkName(package)).Identifier == ".NETCoreApp";
+        }
+
         public static bool HasSetting(this TestPackage package, string name)
         {
             return package.Settings.ContainsKey(name);

src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs

@@ -686,6 +686,7 @@ private void UpdateViewCommands(bool testLoading = false)
             _view.RecentFilesMenu.Enabled = !testRunning && !testLoading;
             _view.ExitCommand.Enabled = !testLoading;
             _view.SaveResultsCommand.Enabled = _view.SaveResultsAsMenu.Enabled = !testRunning && !testLoading && _model.HasResults;
+            _view.RunInProcess.Enabled = testLoaded && _model.TestPackage.IsNetFrameworkPackage();
         }
 
         private string CreateOpenFileFilter()

src/TestCentric/testcentric.gui/Views/IMainView.cs

@@ -36,6 +36,7 @@ public interface IMainView
         ICommand ReloadTestsCommand { get; }
         IToolStripMenu RuntimeMenu { get; }
         ISelection ProcessModel { get; }
+        IChecked RunInProcess { get; }
         IChecked RunAsX86 { get; }
         ISelection DomainUsage { get; }
         IToolStripMenu RecentFilesMenu { get; }

src/TestCentric/testcentric.gui/Views/TestCentricMainView.cs

@@ -150,6 +150,7 @@ public TestCentricMainView() : base("TestCentric")
             //SelectedRuntime = new CheckedMenuGroup(runtimeMenuItem);
             ProcessModel = new CheckedToolStripMenuGroup("Process Model",
                 defaultProcessMenuItem, inProcessMenuItem, singleProcessMenuItem, multipleProcessMenuItem);
+            RunInProcess = new ToolStripMenuElement(inProcessMenuItem);
             DomainUsage = new CheckedToolStripMenuGroup("Domain Usage",
                 defaultDomainMenuItem, singleDomainMenuItem, multipleDomainMenuItem);
             RunAsX86 = new ToolStripMenuElement(runAsX86MenuItem);
@@ -1103,6 +1104,7 @@ public int SplitterPosition
         public ICommand ReloadTestsCommand { get; }
         public IToolStripMenu RuntimeMenu { get; }
         public ISelection ProcessModel { get; private set; }
+        public IChecked RunInProcess { get; private set; }
         public IChecked RunAsX86 { get; private set; }
         public ISelection DomainUsage { get; private set; }
         public IToolStripMenu RecentFilesMenu { get; }

src/TestCentric/tests/Presenters/Main/WhenTestRunBegins.cs

@@ -17,6 +17,7 @@ protected void SimulateTestRunStarting()
 
             _model.HasTests.Returns(true);
             _model.IsTestRunning.Returns(true);
+            _model.TestPackage.Returns(new NUnit.Engine.TestPackage("dummy.dll"));
             FireRunStartingEvent(1234);
         }
 

src/TestCentric/tests/Presenters/Main/WhenTestRunCompletes.cs

@@ -20,6 +20,7 @@ public void SimulateTestRunFinish()
             _model.HasTests.Returns(true);
             _model.HasResults.Returns(true);
             _model.IsTestRunning.Returns(false);
+            _model.TestPackage.Returns(new NUnit.Engine.TestPackage("dummy.dll"));
 
             var resultNode = new ResultNode("<test-run/>");
             FireRunFinishedEvent(resultNode);

src/TestCentric/tests/Presenters/Main/WhenTestsAreLoaded.cs

@@ -19,6 +19,7 @@ public void SimulateTestLoad()
 
             _model.HasTests.Returns(true);
             _model.IsTestRunning.Returns(false);
+            _model.TestPackage.Returns(new NUnit.Engine.TestPackage("dummy.dll"));
 
             TestNode testNode = new TestNode("<test-suite id='1'/>");
             _model.Tests.Returns(testNode);

src/TestCentric/tests/Presenters/Main/WhenTestsAreReloaded.cs

@@ -22,6 +22,8 @@ public void SimulateTestLoad()
 
             TestNode testNode = new TestNode("<test-suite id='1'/>");
             _model.Tests.Returns(testNode);
+            _model.TestPackage.Returns(new NUnit.Engine.TestPackage("dummy.dll"));
+
             FireTestReloadedEvent(testNode);
         }