Merge pull request #1756 from nunit/issue-1754a

Complete issue 1754

Author: CharliePoole

package-tests.cake

@@ -413,10 +413,17 @@ NetCoreRunnerTests.Add(new PackageTest(1, "NoExtensionsInstalled")
     ExpectedOutput = new[] { DoesNotContain("Extension:") }
 });
 
-AddToBothLists(new PackageTest(1, "ExtensionsInstalledFromAddedDirectory")
+StandardRunnerTests.Add(new PackageTest(1, "ExtensionsInstalledFromAddedDirectory")
 {
     Description = "List Extensions shows extension from added directory",
-    Arguments = "--extensionDirectory ../../src/TestData/FakeExtensions --list-extensions",
+    Arguments = "--extensionDirectory fakesv2/net462 --list-extensions",
+    ExpectedOutput = new[] { Contains("Extension:", exactly: 5) }
+});
+
+NetCoreRunnerTests.Add(new PackageTest(1, "ExtensionsInstalledFromAddedDirectory")
+{
+    Description = "List Extensions shows extension from added directory",
+    Arguments = "--extensionDirectory fakesv2/netstandard2.0 --list-extensions --trace:Debug",
     ExpectedOutput = new[] { Contains("Extension:", exactly: 5) }
 });
 
@@ -451,14 +458,14 @@ AddToBothLists(new PackageTest(1, "ExtensionsInstalledFromAddedDirectory")
 //    ExtensionsNeeded = new[] { Extensions.NUnitProjectLoader }
 //});
 
-// V2 Result Writer Test
-StandardRunnerTests.Add(new PackageTest(1, "V2ResultWriterTest_Net462")
-{
-    Description = "Run mock-assembly under .NET 4.6.2 and produce V2 output",
-    Arguments = "testdata/net462/mock-assembly.dll --result=TestResult.xml --result=NUnit2TestResult.xml;format=nunit2",
-    ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2"),
-    ExtensionsNeeded = new[] { Extensions.NUnitV2ResultWriter }
-});
+//// V2 Result Writer Test
+//StandardRunnerTests.Add(new PackageTest(1, "V2ResultWriterTest_Net462")
+//{
+//    Description = "Run mock-assembly under .NET 4.6.2 and produce V2 output",
+//    Arguments = "testdata/net462/mock-assembly.dll --result=TestResult.xml --result=NUnit2TestResult.xml;format=nunit2",
+//    ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2"),
+//    ExtensionsNeeded = new[] { Extensions.NUnitV2ResultWriter }
+//});
 
 //StandardRunnerTests.Add(new PackageTest(1, "V2ResultWriterTest_Net60")
 //{

src/NUnitCommon/nunit.extensibility.tests/ExtensionManagerTests.cs

@@ -100,7 +100,7 @@ public void CreateExtensionManager()
 
             // Find Fake Extensions using alternate start directory
             _extensionManager.FindExtensionAssemblies(FAKE_EXTENSIONS_PARENT_DIRECTORY);
-            _extensionManager.LoadExtensions();
+            _extensionManager.InstallExtensions();
         }
 
         [Test]

src/NUnitCommon/nunit.extensibility/ExtensionManager.cs

@@ -47,7 +47,7 @@ public class ExtensionManager
         // List of ExtensionNodes for all extensions discovered.
         private readonly List<ExtensionNode> _extensions = new List<ExtensionNode>();
 
-        private bool _extensionsAreLoaded;
+        private bool _extensionsAreInstalled;
 
         // AssemblyTracker is a List of candidate ExtensionAssemblies, with built-in indexing
         // by file path and assembly name, eliminating the need to update indices separately.
@@ -173,15 +173,7 @@ public virtual void FindExtensionPoints(params Assembly[] targetAssemblies)
         /// <summary>
         /// Gets an enumeration of all installed Extensions.
         /// </summary>
-        public IEnumerable<ExtensionNode> Extensions
-        {
-            get
-            {
-                LoadExtensions();
-
-                return _extensions.ToArray();
-            }
-        }
+        public IEnumerable<ExtensionNode> Extensions => _extensions.ToArray();
 
         /// <summary>
         /// Find ExtensionAssemblies for a host assembly using
@@ -237,34 +229,33 @@ public void FindExtensionAssemblies(string startDir)
         /// </summary>
         public IEnumerable<T> GetExtensions<T>()
         {
-            foreach (var node in GetExtensionNodes<T>())
-                yield return (T)node.ExtensionObject;
+            foreach (ExtensionNode node in GetExtensionNodes<T>())
+                if (node.ExtensionObject is T)
+                    yield return (T)node.ExtensionObject;
         }
 
         /// <summary>
         /// Enable or disable an extension
         /// </summary>
         public void EnableExtension(string typeName, bool enabled)
         {
-            LoadExtensions();
-
             foreach (var node in _extensions)
                 if (node.TypeName == typeName)
                     node.Enabled = enabled;
         }
 
         /// <summary>
-        /// We can only load extensions after all candidate assemblies are identified.
+        /// We can only install extensions after all candidate assemblies are identified.
         /// This method may be called by the user after all "Find" calls are complete.
         /// If the user fails to call it and subsequently tries to examine extensions
         /// using other ExtensionManager properties or methods, it will be called
         /// but calls not going through ExtensionManager may fail.
         /// </summary>
-        public void LoadExtensions()
+        public void InstallExtensions()
         {
-            if (!_extensionsAreLoaded)
+            if (!_extensionsAreInstalled)
             {
-                _extensionsAreLoaded = true;
+                _extensionsAreInstalled = true;
 
                 foreach (var candidate in _assemblyTracker)
                     FindExtensionsInAssembly(candidate);
@@ -280,12 +271,13 @@ public void LoadExtensions()
         /// </summary>
         public IEnumerable<ExtensionNode> GetExtensionNodes(string path)
         {
-            LoadExtensions();
-
-            var ep = GetExtensionPoint(path);
-            if (ep is not null)
-                foreach (var node in ep.Extensions)
+            foreach (var node in _extensions)
+                if (node.Path == path)
                     yield return node;
+            //var ep = GetExtensionPoint(path);
+            //if (ep is not null)
+            //    foreach (var node in ep.Extensions)
+            //        yield return node;
         }
 
         /// <summary>
@@ -294,8 +286,6 @@ public IEnumerable<ExtensionNode> GetExtensionNodes(string path)
         /// <param name="path">The identifying path for an ExtensionPoint</param>
         public ExtensionNode? GetExtensionNode(string path)
         {
-            LoadExtensions();
-
             var ep = GetExtensionPoint(path);
 
             return ep is not null && ep.Extensions.Count > 0 ? ep.Extensions[0] : null;
@@ -307,8 +297,6 @@ public IEnumerable<ExtensionNode> GetExtensionNodes(string path)
         /// <param name="includeDisabled">If true, disabled nodes are included</param>
         public IEnumerable<ExtensionNode> GetExtensionNodes<T>(bool includeDisabled = false)
         {
-            LoadExtensions();
-
             var ep = GetExtensionPoint(typeof(T));
             if (ep is not null)
                 foreach (var node in ep.Extensions)

src/NUnitCommon/nunit.extensibility/ExtensionNode.cs

@@ -113,12 +113,26 @@ public IEnumerable<string> GetValues(string name)
         /// returns the same object. Use CreateExtensionObject if a new one is
         /// needed each time or to specify arguments.
         /// </summary>
-        public object ExtensionObject
+        public object? ExtensionObject
         {
             get
             {
                 if (_extensionObject is null)
-                    _extensionObject = CreateExtensionObject();
+                    try
+                    {
+                        _extensionObject = CreateExtensionObject();
+                        Status = ExtensionStatus.Loaded;
+                    }
+                    catch (Exception ex)
+                    {
+                        if (ex is TargetInvocationException)
+                            ex = ex.InnerException!;
+
+                        Status = ExtensionStatus.Error;
+                        Enabled = false;
+                        Exception = new ExtensibilityException(
+                            $"Error constructing '{TypeName}'.", ex);
+                    }
 
                 return _extensionObject;
             }

src/NUnitConsole/nunit4-console/ConsoleRunner.cs

@@ -85,7 +85,7 @@ public ConsoleRunner(ITestEngine engine, ConsoleOptions options, ExtendedTextWri
             foreach (string extensionDirectory in _options.ExtensionDirectories)
                 _extensionService.FindExtensionAssemblies(extensionDirectory);
 
-            _extensionService.LoadExtensions();
+            _extensionService.InstallExtensions();
 
             _workDirectory = options.WorkDirectory ?? Directory.GetCurrentDirectory();
 

src/NUnitConsole/nunit4-console/Program.cs

@@ -82,24 +82,24 @@ public static int Main(string[] args)
                 if (Options.ShowVersion)
                     return ConsoleRunner.OK;
 
-                if (Options.WarningMessages.Count != 0)
+                if (Options.WarningMessages.Count > 0)
                 {
                     foreach (string message in Options.WarningMessages)
                         OutWriter.WriteLine(ColorStyle.Warning, message);
 
                     OutWriter.WriteLine();
                 }
 
-                using (ITestEngine engine = new TestEngine())
+                if (Options.ErrorMessages.Count > 0)
                 {
-                    if (Options.ErrorMessages.Count > 0)
-                    {
-                        foreach (string message in Options.ErrorMessages)
-                            WriteErrorMessage(message);
+                    foreach (string message in Options.ErrorMessages)
+                        WriteErrorMessage(message);
 
-                        return ConsoleRunner.INVALID_ARG;
-                    }
+                    return ConsoleRunner.INVALID_ARG;
+                }
 
+                using (ITestEngine engine = new TestEngine())
+                {
                     if (Options.RuntimeFrameworkSpecified)
                     {
                         if (engine.Services.TryGetService<IAvailableRuntimes>(out var availableRuntimes))

src/NUnitEngine/nunit.engine.api/IExtensionService.cs

@@ -47,17 +47,16 @@ public interface IExtensionService
         void EnableExtension(string typeName, bool enabled);
 
         /// <summary>
-        /// If extensions have not yet been loaded, examine all candidate assemblies
+        /// If extensions have not yet been installed, examine all candidate assemblies
         /// and load them. Subsequent calls are ignored.
         /// </summary>
         /// <remarks>
-        /// We can only load extensions after all candidate assemblies are identified.
+        /// We can only install extensions after all candidate assemblies are identified.
         /// This method may be called by the user after all "Find" calls are complete.
         /// If the user fails to call it and subsequently tries to examine extensions
-        /// using other ExtensionManager properties or methods, it will be called
-        /// but calls not going through ExtensionManager may fail.
+        /// using certain ExtensionManager methods, it is called automatically.
         /// </remarks>
-        void LoadExtensions();
+        void InstallExtensions();
 
         /// <summary>
         /// Get extension objects for all nodes of a given type

src/NUnitEngine/nunit.engine.api/SettingDefinitions.cs

@@ -43,6 +43,11 @@ public static class SettingDefinitions
         /// </summary>
         public static SettingDefinition<string> ConfigurationFile { get; } = new(nameof(ConfigurationFile), string.Empty);
 
+        /// <summary>
+        /// A list of the available configs for this project.
+        /// </summary>
+        public static SettingDefinition<string> ConfigNames { get; } = new(nameof(ConfigNames), string.Empty);
+
         ///// <summary>
         ///// Flag (bool) indicating whether tests are being debugged.
         ///// </summary>
@@ -69,7 +74,6 @@ public static class SettingDefinitions
 
         /// <summary>
         /// The maximum number of test agents permitted to run simultaneously.
-        /// Ignored if the ProcessModel is not set or defaulted to Multiple.
         /// </summary>
         public static SettingDefinition<int> MaxAgents { get; } = new(nameof(MaxAgents), 0);
 

src/NUnitEngine/nunit.engine.tests/Services/ServiceManagerTests.cs

@@ -9,15 +9,17 @@ public class ServiceManagerTests
     {
         private IService _fakeService;
         private ServiceManager _serviceManager;
+        private ServiceContext _context;
 
         [SetUp]
         public void SetUp()
         {
-            _serviceManager = new ServiceManager();
+            _context = new ServiceContext();
+            _serviceManager = _context.ServiceManager;
 
             _fakeService = new FakeService();
-            _serviceManager.AddService(_fakeService);
-            _serviceManager.AddService(new ExtensionService());
+            _context.Add(_fakeService);
+            _context.Add(new ExtensionService());
         }
 
         [TearDown]

src/NUnitEngine/nunit.engine/Services/ExtensionService.cs

@@ -103,7 +103,7 @@ public void EnableExtension(string typeName, bool enabled)
         /// If extensions have not yet been loaded, examine all candidate assemblies
         /// and load them. Subsequent calls are ignored.
         /// </summary>
-        public void LoadExtensions() => _extensionManager.LoadExtensions();
+        public void InstallExtensions() => _extensionManager.InstallExtensions();
 
         /// <summary>
         /// Get extension objects for all nodes of a given type
@@ -167,6 +167,8 @@ public IEnumerable<ExtensionNode> GetExtensionNodes(string path)
 
         public override void StartService()
         {
+            base.StartService();
+
             try
             {
                 _extensionManager.FindExtensionPoints(