Fix build for drifted changes and mismerge

crj-mc · Jul 13, 2017 · ddeff66 · ddeff66
1 parent faa72a2
commit ddeff66
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/GoogleTestAdapter/Common.Dynamic.GTA/Strings.cs b/GoogleTestAdapter/Common.Dynamic.GTA/Strings.cs
@@ -5,6 +5,7 @@ namespace GoogleTestAdapter.Common
 {
     public class Strings : IStrings
     {
+        public string ExtensionName => "Google Test Adapter";
         public string TroubleShootingLink => "Check out Google Test Adapter's trouble shooting section at https://github.com/csoltenborn/GoogleTestAdapter#trouble_shooting";
         public string TestDiscoveryStarting => "Google Test Adapter: Test discovery starting...";
         public string TestExecutionStarting => "Google Test Adapter: Test execution starting...";

diff --git a/GoogleTestAdapter/Common.Dynamic.TAfGT/Strings.cs b/GoogleTestAdapter/Common.Dynamic.TAfGT/Strings.cs
@@ -5,6 +5,7 @@ namespace GoogleTestAdapter.Common
 {
     public class Strings : IStrings
     {
+        public string ExtensionName => "Test Adapter for Google Test";
         public string TroubleShootingLink => "Check out Test Adapter for Google Test's trouble shooting section at https://go.microsoft.com/fwlink/?linkid=848168";
         public string TestDiscoveryStarting => "Test Adapter for Google Test: Test discovery starting...";
         public string TestExecutionStarting => "Test Adapter for Google Test: Test execution starting...";

diff --git a/GoogleTestAdapter/Common/IStrings.cs b/GoogleTestAdapter/Common/IStrings.cs
@@ -5,6 +5,7 @@ namespace GoogleTestAdapter.Common
 {
     public interface IStrings
     {
+        string ExtensionName { get; }
         string TroubleShootingLink { get; }
         string TestDiscoveryStarting { get; }
         string TestExecutionStarting { get; }

diff --git a/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs b/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs
@@ -371,7 +371,7 @@ private RunSettingsContainer SetupFinalRunSettingsContainer(
             navigator.MoveToChild(Constants.RunSettingsName, "");
             navigator.MoveToChild(GoogleTestConstants.SettingsName, "");
 
-            return RunSettingsContainer.LoadFromXml(navigator.ReadSubtree());
+            return RunSettingsContainer.LoadFromXml(navigator);
         }
 
         private RunSettingsContainer SetupSettingsContainer(string solutionWorkingDir, 

diff --git a/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs b/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs
@@ -39,7 +39,7 @@ public override void Log(Severity severity, string message)
                     throw new Exception($"Unknown enum literal: {severity}");
             }
 
-            activityLog.LogEntry((uint)activitylogEntrytype, SettingsWrapper.OptionsCategoryName, message);
+            activityLog.LogEntry((uint)activitylogEntrytype, Strings.Instance.ExtensionName, message);
         }
     }
 

diff --git a/GoogleTestAdapter/VsPackage.Tests.Generated/ConsoleTests.tt b/GoogleTestAdapter/VsPackage.Tests.Generated/ConsoleTests.tt
@@ -45,7 +45,7 @@ namespace GoogleTestAdapter.VsPackage
 		<# } #>
 		<# foreach (string executable in executables.Keys) { #>
 
-		[TestMethod <#= line.Ignore ? ", Ignore" : "" #>]
+		[TestMethod <#= executables[executable].Ignore ? ", Ignore" : "" #>]
         [TestCategory(EndToEnd)]
 		public void List_TestsOf_<#= executable #>()
 		{
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ public override void Log(Severity severity, string message) @@
                         throw new Exception($"Unknown enum literal: {severity}");
                 }
-                activityLog.LogEntry((uint)activitylogEntrytype, SettingsWrapper.OptionsCategoryName, message);
+                activityLog.LogEntry((uint)activitylogEntrytype, Strings.Instance.ExtensionName, message);
             }
         }
@@ Expand Down @@