Removed unnecessary diagnostic messages (and finished wiring up diagnostic message display)

Author: bradwilson

xunit.runner.visualstudio.testadapter/Visitors/VsDiscoveryVisitor.cs

@@ -71,9 +71,6 @@ public static TestCase CreateVsTestCase(string source, ITestFrameworkDiscoverer
                 result.CodeFilePath = xunitTestCase.SourceInformation.FileName;
                 result.LineNumber = xunitTestCase.SourceInformation.LineNumber.GetValueOrDefault();
 
-                if (logDiscovery)
-                    logger.SendMessage(TestMessageLevel.Informational, String.Format("Discovered: {0} (unique ID {1})", fqTestMethodName, xunitTestCase.UniqueID));
-
                 return result;
             }
             catch (Exception ex)

xunit.runner.visualstudio.testadapter/Visitors/VsExecutionVisitor.cs

@@ -17,8 +17,8 @@ public class VsExecutionVisitor : TestMessageVisitor<ITestAssemblyFinished>
         readonly Dictionary<ITestCase, TestCase> testCases;
 
         public VsExecutionVisitor(ITestExecutionRecorder recorder,
-                                  Dictionary<ITestCase, TestCase> testCases, 
-                                  ITestFrameworkExecutionOptions executionOptions, 
+                                  Dictionary<ITestCase, TestCase> testCases,
+                                  ITestFrameworkExecutionOptions executionOptions,
                                   Func<bool> cancelledThunk)
         {
             this.recorder = recorder;
@@ -143,9 +143,6 @@ private VsTestResult MakeVsTestResult(TestOutcome outcome, ITestCase testCase, s
             if (!String.IsNullOrEmpty(output))
                 result.Messages.Add(new VsTestResultMessage(VsTestResultMessage.StandardOutCategory, output));
 
-            if (executionOptions.GetDiagnosticMessagesOrDefault())
-                recorder.SendMessage(TestMessageLevel.Informational, String.Format("Executed: {0} (unique ID {1})", fqTestMethodName, testCase.UniqueID));
-
             return result;
         }
     }

xunit.runner.visualstudio.testadapter/VsTestRunner.cs

@@ -115,7 +115,7 @@ void DiscoverTests<TVisitor>(IEnumerable<string> sources,
 
                                         if (configuration.DiagnosticMessagesOrDefault)
                                             logger.SendMessage(TestMessageLevel.Informational,
-                                                               String.Format("[xUnit.net {0}] Discovery starting: {1} (name display = {2})", stopwatch.Elapsed, fileName, discoveryOptions.GetMethodDisplay()));
+                                                               String.Format("[xUnit.net {0}] Discovery starting: {1} (name display = {2})", stopwatch.Elapsed, fileName, discoveryOptions.GetMethodDisplayOrDefault()));
 
                                         using (var visitor = visitorFactory(assemblyFileName, framework, discoveryOptions))
                                         {
@@ -294,12 +294,13 @@ void RunTestsInAssembly(IDiscoveryContext discoveryContext,
                 return;
 
             var assemblyFileName = runInfo.AssemblyFileName;
+            var assemblyDisplayName = Path.GetFileNameWithoutExtension(assemblyFileName);
 
             if (runInfo.Configuration.DiagnosticMessagesOrDefault)
                 lock (stopwatch)
                     frameworkHandle.SendMessage(TestMessageLevel.Informational, String.Format("[xUnit.net {0}] Execution starting: {1} (method display = {2}, parallel test collections = {3}, max threads = {4})",
                                                                                               stopwatch.Elapsed,
-                                                                                              Path.GetFileName(assemblyFileName),
+                                                                                              assemblyDisplayName,
                                                                                               runInfo.Configuration.MethodDisplayOrDefault,
                                                                                               runInfo.Configuration.ParallelizeTestCollectionsOrDefault,
                                                                                               runInfo.Configuration.MaxParallelThreadsOrDefault));
@@ -312,7 +313,8 @@ void RunTestsInAssembly(IDiscoveryContext discoveryContext,
             assemblyFileName = Path.Combine(Windows.ApplicationModel.Package.Current.InstalledLocation.Path, Path.GetFileName(assemblyFileName));
 #endif
 
-            var controller = new XunitFrontController(assemblyFileName, configFileName: null, shadowCopy: true);
+            var diagnosticMessageVisitor = new DiagnosticMessageVisitor(frameworkHandle, assemblyDisplayName, runInfo.Configuration.DiagnosticMessagesOrDefault);
+            var controller = new XunitFrontController(assemblyFileName, configFileName: null, shadowCopy: true, diagnosticMessageSink: diagnosticMessageVisitor);
 
             lock (toDispose)
                 toDispose.Add(controller);
@@ -328,7 +330,7 @@ void RunTestsInAssembly(IDiscoveryContext discoveryContext,
 
             if (runInfo.Configuration.DiagnosticMessagesOrDefault)
                 lock (stopwatch)
-                    frameworkHandle.SendMessage(TestMessageLevel.Informational, String.Format("[xUnit.net {0}] Execution finished: {1}", stopwatch.Elapsed, Path.GetFileName(assemblyFileName)));
+                    frameworkHandle.SendMessage(TestMessageLevel.Informational, String.Format("[xUnit.net {0}] Execution finished: {1}", stopwatch.Elapsed, assemblyDisplayName));
         }
 
         ManualResetEvent RunTestsInAssemblyAsync(IDiscoveryContext discoveryContext,