From 8b0a995f2312e7751901f2eed955c11df435d7eb Mon Sep 17 00:00:00 2001
From: Lavius Motileng <58791731+laviusmotileng-ms@users.noreply.github.com>
Date: Fri, 15 May 2020 09:38:47 -0700
Subject: [PATCH] [Settings V2] Updated general settings tests (#2971)

* updated general settings tests

* reverted changes to solution files

* fetch test strings from a string resource

* updated bidning variable name to avoid confusion

Co-authored-by: Lavius Motileng <laviusmotileng-ms>
---
 .../Strings/en-us/Resources.resw                 |  4 ++--
 .../ViewModels/GeneralViewModel.cs               | 16 +++++++++++-----
 .../Views/GeneralPage.xaml                       |  4 ++--
 .../ViewModelTests/General.cs                    |  9 +++------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index ad208a2f55..361c313080 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -545,10 +545,10 @@
   <data name="GeneralSettings_AlwaysRunAsAdminText.Header" xml:space="preserve">
     <value>Always run as administrator</value>
   </data>
-  <data name="GeneralSettings_Running as Adminstrator_IsNotElevated" xml:space="preserve">
+  <data name="GeneralSettings_RunningAsUserText" xml:space="preserve">
     <value>Running as user</value>
   </data>
-  <data name="GeneralSettings_RunningAsAdminText_IsElevated" xml:space="preserve">
+  <data name="GeneralSettings_RunningAsAdminText" xml:space="preserve">
     <value>Running as adminstrator</value>
   </data>
   <data name="About_FancyZones.Text" xml:space="preserve">
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
index 25d0e9f490..9d3e7219d9 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/GeneralViewModel.cs
@@ -27,7 +27,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public ButtonClickCommand RestartElevatedButtonEventHandler { get; set; }
 
-        private ResourceLoader loader = ResourceLoader.GetForCurrentView();
+        private ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
+
+        public readonly string RunningAsUserDefaultText;
+        public readonly string RunningAsAdminDefaultText;
 
         public GeneralViewModel()
         {
@@ -97,6 +100,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             _autoDownloadUpdates = GeneralSettingsConfigs.AutoDownloadUpdates;
             _isElevated = ShellPage.IsElevated;
             _runElevated = GeneralSettingsConfigs.RunElevated;
+
+            RunningAsUserDefaultText = loader.GetString("GeneralSettings_RunningAsUserText");
+            RunningAsAdminDefaultText = loader.GetString("GeneralSettings_RunningAsAdminText");
+
             _isAdmin = ShellPage.IsUserAnAdmin;
         }
 
@@ -147,17 +154,17 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public string RunningAsAdminText
+        public string RunningAsText
         {
             get
             {
                 if (!IsElevated)
                 {
-                    return loader.GetString("GeneralSettings_Running as Adminstrator_IsNotElevated");
+                    return RunningAsUserDefaultText;
                 }
                 else
                 {
-                    return loader.GetString("GeneralSettings_RunningAsAdminText_IsElevated");
+                    return RunningAsAdminDefaultText;
                 }
             }
 
@@ -182,7 +189,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     _isElevated = value;
                     OnPropertyChanged("IsElevated");
                     OnPropertyChanged("IsAdminButtonEnabled");
-                    //OnPropertyChanged("AlwaysRunAsAdminText");
                     OnPropertyChanged("RunningAsAdminText");
                 }
             }
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index a5d14b4a4b..e831d074b1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -54,8 +54,8 @@
                     x:Name="GeneralSettingsView">
             <TextBlock x:Uid="Admin_Mode"
                        Style="{StaticResource SubtitleTextBlockStyle}"/>
-            
-            <TextBlock Text="{Binding Mode=TwoWay, Path=RunningAsAdminText, Source={StaticResource eventViewModel}}"
+
+            <TextBlock Text="{Binding Mode=TwoWay, Path=RunningAsText, Source={StaticResource eventViewModel}}"
                        Margin="{StaticResource SmallTopMargin}"/>
 
             <Button x:Uid="GeneralPage_RestartAsAdmin_Button"
diff --git a/src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/General.cs b/src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/General.cs
index a27040d404..4e027828c7 100644
--- a/src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/General.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/General.cs
@@ -49,18 +49,15 @@ namespace ViewModelTests
         {
             // Arrange
             GeneralViewModel viewModel = new GeneralViewModel();
-            
-            string runningAsUserText = "Running as user.";
-            string runningAsAdminText = "Running as Adminstrator.";
-            
-            Assert.AreEqual(runningAsUserText, viewModel.RunningAsAdminText);
+                        
+            Assert.AreEqual(viewModel.RunningAsUserDefaultText, viewModel.RunningAsText);
             Assert.IsFalse(viewModel.IsElevated);
             
             // Act
             viewModel.IsElevated = true;
 
             // Assert
-            Assert.AreEqual(runningAsAdminText, viewModel.RunningAsAdminText);
+            Assert.AreEqual(viewModel.RunningAsAdminDefaultText, viewModel.RunningAsText);
             Assert.IsTrue(viewModel.IsElevated);
         }