Merge changes from drognanar:runsettings

.gitattributes

@@ -1,7 +1,6 @@
 # Normalize line endings
 * text=auto
 
-
 # Prevent files from being exported
 .gitattributes export-ignore
 .gitignore     export-ignore

src/NUnitTestAdapter/AdapterSettings.cs

@@ -66,6 +66,12 @@ public AdapterSettings(TestLogger logger)
         public int? RandomSeed { get; private set; }
         public bool RandomSeedSpecified { get; private set; }
 
+        public bool InProcDataCollectorsAvailable { get; private set; }
+
+        public bool SynchronousEvents { get; private set; }
+
+        public string DomainUsage { get; set; }
+
         #endregion
 
         #region Public Methods
@@ -136,6 +142,16 @@ public void Load(string settingsXml)
             // Force Verbosity to 1 under Debug
             Verbosity = 1;
 #endif
+
+            // If any in proc data collector will be instantiated by the TestPlatform run tests sequentially.
+            var inProcDataCollectorNode = doc.SelectSingleNode("RunSettings/InProcDataCollectionRunSettings/InProcDataCollectors");
+            InProcDataCollectorsAvailable = inProcDataCollectorNode != null && inProcDataCollectorNode.SelectNodes("InProcDataCollector").Count > 0;
+            if (InProcDataCollectorsAvailable)
+            {
+                NumberOfTestWorkers = 0;
+                DomainUsage = "None";
+                SynchronousEvents = true;
+            }
         }
 
         public void SaveRandomSeed(string dirname)

src/NUnitTestAdapter/NUnit3TestDiscoverer.cs

@@ -37,6 +37,13 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove
             // Ensure any channels registered by other adapters are unregistered
             CleanUpRegisteredChannels();
 
+            if (Settings.InProcDataCollectorsAvailable && sources.Count() > 1)
+            {
+                TestLog.Error("Unexpected to discover tests in multiple assemblies when InProcDataCollectors specified in run configuration.");
+                Unload();
+                return;
+            }
+
             foreach (string sourceAssembly in sources)
             {
                 TestLog.Debug("Processing " + sourceAssembly);

src/NUnitTestAdapter/NUnit3TestExecutor.cs

@@ -61,6 +61,13 @@ public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrame
 #endif
             Initialize(runContext, frameworkHandle);
 
+            if (Settings.InProcDataCollectorsAvailable && sources.Count() > 1)
+            {
+                TestLog.Error("Failed to run tests for multiple assemblies when InProcDataCollectors specified in run configuration.");
+                Unload();
+                return;
+            }
+
             foreach (var source in sources)
             {
                 try
@@ -101,6 +108,13 @@ public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrame
             Initialize(runContext, frameworkHandle);
 
             var assemblyGroups = tests.GroupBy(tc => tc.Source);
+            if (Settings.InProcDataCollectorsAvailable && assemblyGroups.Count() > 1)
+            {
+                TestLog.Error("Failed to run tests for multiple assemblies when InProcDataCollectors specified in run configuration.");
+                Unload();
+                return;
+            }
+
             foreach (var assemblyGroup in assemblyGroups)
             {
                 var assemblyName = assemblyGroup.Key;

src/NUnitTestAdapter/NUnitTestAdapter.cs

@@ -146,6 +146,8 @@ private TestPackage CreateTestPackage(string assemblyName)
                     package.Settings[PackageSettings.NumberOfTestWorkers] = workers;
             }
 
+            package.Settings[PackageSettings.SynchronousEvents] = Settings.SynchronousEvents;
+
             int timeout = Settings.DefaultTimeout;
             if (timeout > 0)
                 package.Settings[PackageSettings.DefaultTimeout] = timeout;
@@ -177,7 +179,15 @@ private TestPackage CreateTestPackage(string assemblyName)
 
             // Always run one assembly at a time in process in it's own domain
             package.Settings[PackageSettings.ProcessModel] = "InProcess";
-            package.Settings[PackageSettings.DomainUsage] = "Single";
+
+            if (Settings.DomainUsage != null)
+            {
+                package.Settings[PackageSettings.DomainUsage] = Settings.DomainUsage;
+            }
+            else
+            {
+                package.Settings[PackageSettings.DomainUsage] = "Single";
+            }
 
             // Force truncation of string arguments to test cases
             package.Settings[PackageSettings.DefaultTestNamePattern] = "{m}{a:40}";

src/NUnitTestAdapterTests/AdapterSettingsTests.cs

@@ -56,6 +56,9 @@ public void DefaultSettings()
             Assert.Null(_settings.BasePath);
             Assert.Null(_settings.PrivateBinPath);
             Assert.NotNull(_settings.RandomSeed);
+            Assert.False(_settings.SynchronousEvents);
+            Assert.Null(_settings.DomainUsage);
+            Assert.False(_settings.InProcDataCollectorsAvailable);
         }
 
         [Test]
@@ -171,5 +174,23 @@ public void RandomSeedSetting()
             _settings.Load("<RunSettings><NUnit><RandomSeed>12345</RandomSeed></NUnit></RunSettings>");
             Assert.That(_settings.RandomSeed, Is.EqualTo(12345));
         }
+
+        [Test]
+        public void InProcDataCollector()
+        {
+            _settings.Load(@"
+<RunSettings>
+    <InProcDataCollectionRunSettings>
+        <InProcDataCollectors>
+            <InProcDataCollector friendlyName='DummyCollectorName' uri='InProcDataCollector://NUnit/DummyCollectorName' />
+        </InProcDataCollectors>
+    </InProcDataCollectionRunSettings>
+</RunSettings>");
+
+            Assert.That(_settings.DomainUsage, Is.EqualTo("None"));
+            Assert.True(_settings.SynchronousEvents);
+            Assert.That(_settings.NumberOfTestWorkers, Is.Zero);
+            Assert.True(_settings.InProcDataCollectorsAvailable);
+        }
     }
 }